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

Conflicts:
	client/Assets/AOW Assets/Scenes/Main/Scripts.meta
	client/Assets/AOW Assets/Scenes/Main/Scripts/GUI/Actions.meta
	client/Assets/Design/Interface/Textures/int_atlas_back/back_win.jpg.meta
	client/Assets/Design/Maps/Decoration/Texture/Terrain/BIG_desert_02.jpg
	client/Assets/Design/Maps/Works/Models/desert2/3rdagedesert2.fbm.meta
	client/Assets/Design/Maps/Works/Models/desert2/Desert2.fbm.meta
	client/Assets/Design/Maps/Works/Models/desert2/Desert2_coast.fbm.meta
	client/Assets/Design/Maps/Works/Models/desert2/Desert2_grass.fbm.meta
	client/Assets/Design/Maps/Works/Models/desert2/Desert2_land.fbm.meta
	client/Assets/Design/Maps/Works/Scenes/test_land.unity
	client/Assets/Design/Model/f1/Materials.meta
	client/Assets/Design/Model/f2/Materials.meta