added coloured power cells, pedestals
Merge branch 'March7Develop' of https://github.com/AndrewBrough/projectmidnight into March7Develop

Conflicts:
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/12/128cab90fea73420aa409507c0e27b6c
	Library/metadata/23/23c42e6154e3246b39ce6bbc261d6604
	Library/metadata/2c/2c43117443d1d0945b1e2d2e0758a015
	Library/metadata/57/57d07089b947c4167a02786178340d92
	Library/metadata/5b/5bdb403b24de2422cbfffe53d1627160
	Library/metadata/6a/6a1ce4827464b405d9881b19b9f4f361
	Library/metadata/6a/6a84c2b5bb52d45cfbc9966eb6973a9d
	Library/metadata/a3/a332f857852a84cda84a4799b738b383
	Library/metadata/b2/b2c30a355ea486f4b89e193f748ad8db
	Library/metadata/c4/c456a1a3764b9440c8b961e2ae25538b
	Library/metadata/e2/e2d3d6762d95b5740ad10b2c2dd4e8c9
	Library/metadata/fe/fe0e079e1809e4021aaca1c251a748a4
merged coloured pedestals and power cells into Level_01 - ceiling lights seem to be missing a model right now