Merging and stuff
Added locationreceiver to manifest
Added settings/help/about and an editName class
Merge branch 'master' of https://github.com/mpatt3970/Trail-Tracker

Conflicts:
	src/edu/mines/locationfinder/MainActivity.java
	src/edu/mines/locationfinder/MapActivity.java