no message
Merge commit '39328950f184c9f2168e03c8edc1c6f6a6b18543' into Dave
Layering stuff.
Merge remote-tracking branch 'origin/develop' into Ronan

Conflicts:
	Assets/Artwork/Characters/TechnoBeetle/TechnoBeetle_Front_Back/TechnoBeetle_Front&Back.png.meta
	Assets/Artwork/Characters/TechnoBeetle/TechnoBeetle_Side/TechnoBeetle_Side.png.meta
	Assets/Artwork/Characters/TechnoBeetle/TechnoBeetle_Side_Mandible/TechnoBeetle_Side_Mandible.png.meta
	Assets/Prefabs/Characters/Miner.prefab
	Assets/Scenes/Prototype.unity
	Assets/Scripts/Editor.meta