app stuff
Merge branch 'master' of https://github.com/SimonLanghoff/SMDP-GROUP19

Conflicts:
	app/bin/SurveyApp.apk
	app/bin/classes.dex
	app/bin/resources.ap_