About page

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

Conflicts:
	Heritage Mapper/AndroidManifest.xml
	Heritage Mapper/project.properties

	modified:   Heritage Mapper/AndroidManifest.xml
	modified:   Heritage Mapper/lint.xml
	modified:   Heritage Mapper/project.properties
	modified:   README.md