Search Optimized
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