Edited test class
Merge branch 'master' of https://github.com/johnnyluu/DementiaSmartWatch-mobile

Conflicts:
	DementiaSmartWatch/bin/DementiaSmartWatch.apk
	DementiaSmartWatch/bin/classes.dex