MapFragment added (simplest implementation- MapActivity is just the
MapFragment)
Map now centres on Trinity.
Merge remote-tracking branch 'origin/maps'

Conflicts:
	Adme_v1/AndroidManifest.xml
	Adme_v1/bin/Adme_v1.apk
	Adme_v1/bin/AndroidManifest.xml
	Adme_v1/bin/classes.dex
	Adme_v1/bin/dexedLibs/android-support-v4-84dcea92e3cf2b475b7e48f0d9a600ec.jar
	Adme_v1/bin/resources.ap_
	Adme_v1/project.properties
	Adme_v1/res/values/strings.xml
	Adme_v1/src/at/adme/app/News.java