UI backbone

kinda ok
UI update 2
Merge branch 'master' of https://github.com/RoxT/HeritageMapper

Conflicts:
	Heritage Mapper/AndroidManifest.xml
	Heritage Mapper/project.properties
	Heritage Mapper/res/layout/activity_main.xml
	Heritage Mapper/src/ca/jchoi/HerritageMapper/MainActivity.java

	modified:   Heritage Mapper/AndroidManifest.xml
	modified:   Heritage Mapper/project.properties
	modified:   Heritage Mapper/res/layout/activity_main.xml
	modified:   Heritage Mapper/src/ca/jchoi/HerritageMapper/MainActivity.java