del
Merge branch 'development' of github.com:kewgen/aow into development

Conflicts:
	client/Assets/Design/Maps/Decoration/Shader.meta
update battle_menu, add context menu building
Merge branch 'development' of github.com:kewgen/aow into development