Commit everything!
Extra activities for location summary UI
Merge branch 'master' of http://github.com/jh409/locator

Conflicts:
	AndroidManifest.xml
	src/co/uk/team4/locator/rest/HttpGetController.java