First push: base map making, biome division, cell division, unit structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
First push: base map making, biome division, cell division, unit structure