GPS table fixed with new user_id for database
Merge remote-tracking branch 'origin/master'

Conflicts:
	DementiaSmartWatch/bin/DementiaSmartWatch.apk
	DementiaSmartWatch/bin/classes.dex
	DementiaSmartWatch/bin/resources.ap_
	DementiaSmartWatch/src/com/agileninjas/dementiasmartwatch/GPSLocation.java
	DementiaSmartWatch/src/com/agileninjas/dementiasmartwatch/tests/MainTest.java