Initial working map view
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/Application/bin/classes.dex
	Source/Application/bin/resources.ap_