Merge branch 'dptam-patch' into development

WARNING: CONTAINS NON-WORKING WRITE DATA SOURCES
RoboTutorLLC · Mar 29, 2018 · 8d81b67 · 8d81b67
2 parents 936c260 + 2ebde32
commit 8d81b67
Show file tree

Hide file tree

Showing 617 changed files with 189,712 additions and 25,515 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -221,4 +221,4 @@ dependencies {
     compile project(':comp_logging')
     compile project(path: ':comp_counting')
     compile project(path: ':comp_counting2')
-}
+}
diff --git a/app/src/main/assets/tutors/activity_selector/assets/data/en/dev_data.json b/app/src/main/assets/tutors/activity_selector/assets/data/en/dev_data.json