movement
Merge branch 'master' of https://github.com/Daluur/Aegis-of-the-City

Conflicts:
	AegisOfTheCity/Library/CurrentLayout.dwlt
	AegisOfTheCity/Library/assetDatabase3
	AegisOfTheCity/Library/guidmapper
	AegisOfTheCity/Library/metadata/3d/3d30e005101c924418c5125cd534e74c
save for mathias