LocationInfroActivity functionality
Merge branch 'master' of https://github.com/RoxT/HeritageMapper

Conflicts:
	Heritage Mapper/src/ca/jchoi/HerritageMapper/MainActivity.java