I add the example about gps, and base on this activity,there will be a longitute and a latitude return on the layout.
just another trying to push
Merge branch 'master' of https://github.com/CMPUT301F14T06/Team06MapleSyrup

Conflicts:
	App/bin/App.apk
	App/bin/resources.ap_