commit_7
Revert "commit_7"

This reverts commit ad8ec2ac73b4bb2e511eeba62eacdeca00507cbf.
commit_8
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Resources/Graphics/Stuff/Materials.meta
	Assets/Resources/Graphics/Stuff/Materials/CylinderMat.mat
	Assets/Resources/Graphics/Stuff/Materials/CylinderMat.mat.meta
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/04/04399eac4f11009479703981715278c2
	Library/metadata/0a/0a8f28763e14d3a438a6c0b9d84a26d7
	Library/metadata/17/17c2dfa09fc6eb2449cb13a2b4baa3bc
	Library/metadata/17/17f56e087f16aa648b5225b52542f774
	Library/metadata/1e/1ef44ca2e6e0ab34892e738e213f5aa7
	Library/metadata/54/545a014fea929004dac576bea3bf6e54
	Library/metadata/88/883198d55fbe1664c85b79934c3c13c6
	Library/metadata/98/98b7c497f6c220d49b571263ce71ce0f
	Library/metadata/b3/b38e63a99189e8243a5c663e7d2713a8
	Library/metadata/bf/bfe21dc47ee7e454d95bb06b3bad29db
	Library/metadata/c8/c8cec6b46ffab884583f387222164e41
	Library/metadata/ca/cab3ca7390541514299b893e4e0bac4e
	Library/metadata/e7/e73505ae3e325264586c340c612b7b6b
	Library/metadata/f4/f47923dd943d21b44ae355450449c9d4
	Library/metadata/f4/f49961baa522dc34f9593446b338c9d2