Test Code for GPS Service
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidApp/src/ch/bfh/fbi/mobiComp/PeopleTag/gui/MainActivity.java