Updated Location Activity
Merge branch 'master' of https://github.com/CMPUT301W14T12/GeoChan

Conflicts:
	res/layout/activity_location.xml
	res/values/strings.xml
	src/ca/ualberta/cs/views/LocationActivity.java