Angela

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

Conflicts:
	Heritage Mapper/project.properties

	modified:   Heritage Mapper/ic_launcher2-web.png
	modified:   Heritage Mapper/project.properties
	modified:   Heritage Mapper/res/drawable-hdpi/ic_launcher2.png
	modified:   Heritage Mapper/res/drawable-mdpi/ic_launcher2.png
	modified:   Heritage Mapper/res/drawable-xhdpi/ic_launcher2.png
	modified:   Heritage Mapper/res/drawable-xxhdpi/ic_launcher2.png
	modified:   Heritage Mapper/res/layout/activity_location_info.xml
	modified:   Heritage Mapper/res/values/strings.xml
	modified:   Heritage Mapper/src/ca/jchoi/HerritageMapper/LocationInfoActivity.java
	modified:   Heritage Mapper/src/ca/jchoi/HerritageMapper/ParsedPointOfInterest.java
	modified:   README.md