last

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

Conflicts:
	Heritage Mapper/project.properties

	modified:   Heritage Mapper/src/ca/jchoi/HerritageMapper/AboutActivity.java