Gps update
Merge branch 'master' of
https://github.com/milanshergill/com.bluehawks.inc.git

Conflicts:
	GPSLocation/res/layout/activity_main.xml
	GPSLocation/src/com/example/gpslocation/MainActivity.java