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

Conflicts:
	UnitsAndSelection/Assets/Prefabs/Units/Bison/InitiatorJ1.prefab
	UnitsAndSelection/Assets/Prefabs/Units/Eagle/EagleJ1.prefab
	UnitsAndSelection/Assets/Prefabs/Units/Harvester/HarvesterJ1.prefab