Merge branch 'master' of https://github.com/psicomante/aamcg

Conflicts:
	Assets/prefabs/MapTile.prefab
	Assets/src/server/MapGenerator.cs
	Assets/src/shared/AmApplication.cs
Merge branch 'master' of https://github.com/psicomante/aamcg

Conflicts:
	Assets/prefabs/MapTile.prefab
	Assets/src/server/MapGenerator.cs
	Assets/src/shared/AmApplication.cs