Revert "commit"

This reverts commit 75de2f371e43ca8ee4ca72955318253c4db8a29a.

Conflicts:
	Assets/Prefabs/player.prefab
	Assets/Scenes/demoLevel.unity
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/07/07de645864b2c4172afd71182c41288b
	Library/metadata/2b/2beaa86e9432a7847987968fe986dd37
	Library/metadata/4f/4fc80fbf3eee36840864ab65f0e23e76
	Library/metadata/da/da9686ea1d42aa84f8c2bd08789c37af
	Library/metadata/eb/eb01094b4734c1e4db401e4d1adb574c