Battle scene UI assets
Merge remote-tracking branch 'origin/master'

Conflicts:

	Assets/Models/model_effects/effect_glowplane/Materials/lambert1.mat.meta

	Assets/Models/model_tanks/gustav/Materials/texture_face_basic_blue.mat.meta
	Assets/Scene/TestScene.unity