IceTrap added
Merge branch 'Job' into develop

Conflicts:
	Assets/Models/Tower&TrapsModels/IceTrap/IceTrap.blend1.meta
	Assets/Models/Tower&TrapsModels/Materials/Material_001__spearThingyUV_Texture_png.mat.meta~HEAD.meta
	Assets/Models/Tower&TrapsModels/SpearTrap.fbm.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinalHotSpotGreen.fbm.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinal_3.fbm.meta
	Assets/Scenes/Tower Tester.meta
	Assets/Scripts/bin/Debug.meta
	Assets/Textures/GUI.meta
	Assets/Textures/GUI/landingPage.psd.meta~Niels.meta