Unity3D build0045pa
Merge branch 'master' of https://github.com/IP12/SoRT

Conflicts:
	Unity3D/Assets/New Terrain 1.asset
	Unity3D/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Unity3D/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Unity3D/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Unity3D/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Unity3D/Library/assetDatabase3
	Unity3D/Library/metadata/ae/ae162c0523ab4468bb03ef160eb672e2