Changed the handler so it's updating once per second. Also started to
fiddle with unique id for future use
Fixed xml not including gps and wifi permission. also added uniqueID
code for future use
XML wasn't being pushed
Commit of recent changes
commit all changes

commit all changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	DementiaSmartWatch/AndroidManifest.xml
	DementiaSmartWatch/bin/AndroidManifest.xml
	DementiaSmartWatch/bin/DementiaSmartWatch.apk
	DementiaSmartWatch/bin/classes.dex
	DementiaSmartWatch/bin/resources.ap_
	DementiaSmartWatch/res/layout/activity_main.xml

	DementiaSmartWatch/src/com/agileninjas/dementiasmartwatch/GPSLocation.java
	DementiaSmartWatch/src/com/agileninjas/dementiasmartwatch/Main.java