stuff
Merge branch 'master' of https://github.com/ProjPossibility/2014-CSUN-CareTaker-2

Conflicts:
	AndroidManifest.xml
	src/com/example/deadreckoning/LocateActivity.java