Wall trap (magic)
Merge branch 'Job' into develop

Conflicts:
	Assets/Models/Tower&TrapsModels/SpearTrap.fbm.meta~HEAD_0.meta
	Assets/Models/Tower&TrapsModels/SpearTrap.fbm.meta~Job.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinalHotSpotGreen.fbm.meta~HEAD.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinalHotSpotGreen.fbm.meta~Job.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinal_3.fbm.meta~HEAD.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinal_3.fbm.meta~Job.meta