Location Settings code cleanup
Merge branch 'LocationSettingsClean' into dev

Conflicts:
	LARD/src/ca/ualberta/lard/LocationSelectionActivity.java