Zoom out enabled on in-game world map.
Update to Android 5.0 (API 21)
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndorsTrail/AndroidManifest.xml
	AndorsTrail/project.properties