Cleanup UI

fixed location info, need to make checkboxes work.
Merge branch 'master' of https://github.com/RoxT/HeritageMapper

Conflicts:
	Heritage Mapper/res/layout/activity_search.xml
	Heritage Mapper/src/ca/jchoi/HerritageMapper/SearchActivity.java

	modified:   Heritage Mapper/project.properties
	modified:   Heritage Mapper/res/layout/activity_search.xml
	modified:   Heritage Mapper/src/ca/jchoi/HerritageMapper/SearchActivity.java
Merge branch 'master' of https://github.com/RoxT/HeritageMapper