animated fire texture
Merge branch 'develop' of https://github.com/nversluis/TowerDefense into Mees

Conflicts:
	Assets/Models/Decorations/chandelier.fbm.meta
	Assets/Models/Tower&TrapsModels/FireTrap/fireTrap.blend1.meta
	Assets/Scripts/TowerHealth.cs.meta
	Assets/Scripts/bin.meta
	Assets/UnityVS/Editor.meta
Merge branch 'Mees' into develop

Conflicts:
	Assets/Models/Decorations/chandelier.fbm.meta
	Assets/Models/Tower&TrapsModels/FireTrap/fireTrap.blend1.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinalHotSpotGreen.fbm.meta
	Assets/Models/Tower&TrapsModels/spearTrapFinal_3.fbm.meta
	Assets/Scripts/TowerHealth.cs.meta
	Assets/Scripts/bin.meta