Merge branch 'dev'

AndrejLukasevic · Jan 4, 2016 · a16e014 · a16e014
2 parents d96c6f2 + 7d17812
commit a16e014
Show file tree

Hide file tree

Showing 45 changed files with 8,287 additions and 10,959 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+.gradle
+.idea/
+*.iml
+ScanDemoExample/local.properties
+ScanDemoExample/build/intermediates/dex-cache/cache.xml
diff --git a/ScanDemoExample/.gradle/2.2.1/taskArtifacts/cache.properties b/ScanDemoExample/.gradle/2.2.1/taskArtifacts/cache.properties
diff --git a/ScanDemoExample/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/ScanDemoExample/.gradle/2.2.1/taskArtifacts/cache.properties.lock
diff --git a/ScanDemoExample/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/ScanDemoExample/.gradle/2.2.1/taskArtifacts/fileHashes.bin
diff --git a/ScanDemoExample/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/ScanDemoExample/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
diff --git a/ScanDemoExample/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/ScanDemoExample/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
diff --git a/ScanDemoExample/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/ScanDemoExample/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
diff --git a/ScanDemoExample/.idea/.name b/ScanDemoExample/.idea/.name
diff --git a/ScanDemoExample/.idea/compiler.xml b/ScanDemoExample/.idea/compiler.xml
diff --git a/ScanDemoExample/.idea/copyright/profiles_settings.xml b/ScanDemoExample/.idea/copyright/profiles_settings.xml
diff --git a/ScanDemoExample/.idea/encodings.xml b/ScanDemoExample/.idea/encodings.xml
diff --git a/ScanDemoExample/.idea/gradle.xml b/ScanDemoExample/.idea/gradle.xml
diff --git a/ScanDemoExample/.idea/libraries/appcompat_v7_21_0_3.xml b/ScanDemoExample/.idea/libraries/appcompat_v7_21_0_3.xml
diff --git a/ScanDemoExample/.idea/libraries/support_annotations_21_0_3.xml b/ScanDemoExample/.idea/libraries/support_annotations_21_0_3.xml
diff --git a/ScanDemoExample/.idea/libraries/support_v4_21_0_3.xml b/ScanDemoExample/.idea/libraries/support_v4_21_0_3.xml
diff --git a/ScanDemoExample/.idea/misc.xml b/ScanDemoExample/.idea/misc.xml
diff --git a/ScanDemoExample/.idea/modules.xml b/ScanDemoExample/.idea/modules.xml
diff --git a/ScanDemoExample/.idea/scopes/scope_settings.xml b/ScanDemoExample/.idea/scopes/scope_settings.xml
diff --git a/ScanDemoExample/.idea/vcs.xml b/ScanDemoExample/.idea/vcs.xml