+Layoutschema as _template
Merge remote-tracking branch 'origin/master'

* origin/master:
  alliance view changes
  some alliance changes
  *Building < BuildingType

Conflicts:
	.idea/MMOG.iml