temporary
Merge remote-tracking branch 'origin/master'

Conflicts:
	geoMMO_android/project.properties