made a setLocation button thing
Merge branch 'master' of https://github.com/CMPUT301F14T07/Team7-301Project
just added the gps permission to the manifest. Figured I should push right away so to avoid any merging issues