Moved Unit selection scene into main scene
Merge branch 'master' of https://github.com/destiny14/toytanfall

Conflicts:
	Assets/Audio.meta
	Assets/External/NGUI/Resources/Atlases/Refractive.meta
	Assets/Models/environment/baukloetze/Materials.meta
	Assets/Models/environment/kinderzimmer/Materials.meta
	Assets/Textures/environment/kinderzimmer/Materials.meta
	Assets/UnityTestTools/Common/Editor/icons.meta