Merge branch 'development' into demo

Merge branch 'demo'

Conflicts:
	survey_app/src/main/AndroidManifest.xml

Update raw zips: correctly handle barcode questions

Merge branch 'development' into demo

Merge branch 'development' into demo

Merge branch 'demo'

Update Gradle Config: version code bump