material update
Merge remote-tracking branch 'origin/master'

Conflicts:
	trunk/Library/CurrentLayout.dwlt
	trunk/Library/ScriptAssemblies/Assembly-CSharp.dll
	trunk/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	trunk/Library/ScriptAssemblies/Assembly-UnityScript.dll
	trunk/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	trunk/Library/assetDatabase3
	trunk/Library/guidmapper
	trunk/Library/metadata/c3/c3f776d12728ab34ab8904e21a7a9f56
	trunk/Library/metadata/cb/cbbba77e9cf913c438d25a90c88adf92