Speartrap in unity
Merge branch 'Leon' into develop

Conflicts:
	Assets/Logo.meta
	Assets/Logo/logoWraithOfTheDwogres.png.meta
	Assets/Logo/logoWraithOfTheDwogres.psd.meta
	Assets/Models/Tower&TrapsModels/Materials/Material_003.mat.meta
	Assets/Models/Tower&TrapsModels/Materials/SpearUV copy.mat.meta
	Assets/Models/Tower&TrapsModels/Materials/spearTrapUv_Texture.mat.meta
	Assets/Models/Tower&TrapsModels/spearTrap.blend.meta
	Assets/Scripts/bin.meta