Level now resets on death
Merge branch 'March7Develop' of https://github.com/AndrewBrough/projectmidnight into March7Develop

Conflicts:
	Assets/Models/Props/Materials/CrateOpen_polySurfaceShape11.mat
	Assets/Models/Props/Materials/CrateOpen_polySurfaceShape11.mat.meta
	Assets/Models/Props/Materials/lambert4.mat
	Assets/Models/Props/Materials/lambert4.mat.meta
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/03/0302a4832af23ac4cb50ee18ff0d7b7c
	Library/metadata/17/176e49f6de199b84fa9ec693108b3166
	Library/metadata/21/212fc68403403ec459b1f59be2550a21
	Library/metadata/38/3877729b2434347909c09077d83a2d50
	Library/metadata/3a/3a2f699df448c8142af153d082e050dc
	Library/metadata/3a/3ac9349ddeeb0b04595fb29e5a29218b
	Library/metadata/3b/3ba01788001bf0f489b6b902194624bf
	Library/metadata/42/428cea3480664114f83945ca92c7aee8
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/46/469aadc15f16cdb4c831aa313d395db7
	Library/metadata/49/49c0e9cc1ebeda045b87ea2ea445537a
	Library/metadata/50/50cfb4f779e96ab42bf3306364d36c35
	Library/metadata/64/64295fce6005c2942ae84b18d2078e4f
	Library/metadata/7e/7e9160f7995bb8c44b48eb99cee29ad2
	Library/metadata/81/81c92c3f0e9bc7b46bd34667a8b2c48b
	Library/metadata/82/82ad4ac7e6a18b147994d5373408afe1
	Library/metadata/ad/ad46e26bcfc99b149a77ce6cf532c82e
	Library/metadata/b8/b814675adf9261e449175f9981db8aa2
	Library/metadata/c1/c1b65590d08389242a4fa5cdd9938f86
	Library/metadata/d8/d82f1e2deedd84c489dc09cc6da7361c
	Library/metadata/d8/d85f19f48940cf44e835540fdcf9bcf3
	Library/metadata/dd/dd8e25d9065d0004f91eaa0801865e27
	Library/metadata/ef/ef161b9d6a8be2c43a771cca989cf15f
	Library/metadata/f8/f814f4b0f920be24b8d374fcb833cf7a
	Library/metadata/fe/fe0e079e1809e4021aaca1c251a748a4
	projectmidnight-csharp.sln
	projectmidnight.sln
	projectmidnight.userprefs