Made location not crash the system, but not sure if works or not. Must test on device.
Merge branch 'bradley'

Conflicts:
	Team10ProjectW2014/AndroidManifest.xml
	Team10ProjectW2014/bin/AndroidManifest.xml