update
Merge branch 'master' of https://github.com/BabacarPlusPlus/TER-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/a2/a2dfc923823c2c2469546cd62adda4c1
	Library/metadata/c9/c9a4fe53cb38bb2419c155072f86ce3d
	TER-2014-csharp.sln
	TER-2014.sln
	TER-2014.userprefs