test
Merge branch 'master' of https://github.com/Nizar89/Warpath

Conflicts:
	UnitsAndSelection/Assets/Scene/BasicControl.unity