Testing
Merge branch 'master' of https://github.com/johnnyluu/DementiaSmartWatch-mobile

Conflicts:
	DementiaSmartWatch/pom.xml
	SmartWatchTests/AndroidManifest.xml

SmartWatchTests/src/main/java/com/agileninjas/dementiasmartwatch/Battery
CheckTest.java

SmartWatchTests/src/main/java/com/agileninjas/dementiasmartwatch/MainTes
t.java