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

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/metadata/05/05471bd28d156cd41a03dd00e5cd8fe4
	Library/metadata/30/30001a371dba7d340814d3e8decc5fc8
	Library/metadata/34/3494ddea19aeff24c9bf5420d09aed1d
	Library/metadata/35/351949d43fa8603408c5e34d150d29e9
	Library/metadata/35/356525a8d2f273e4b9a88847a5ca99e1
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/85/85ece79fe705a2646bec8b183aa3a5c9
	Library/metadata/a5/a5bb6d7f702b144408661eb792cb2e36
	Library/metadata/b8/b877e12b1a870b34fa44b7a3a5c6cbe1
	Library/metadata/bf/bf83e9e74dba58b4f8b602cfa331c1db
	Library/metadata/c7/c7de5b9bbf95df24185e1807e650463c
	Library/metadata/c9/c9a4fe53cb38bb2419c155072f86ce3d
	Library/metadata/ca/ca84db66cec56b841b7189a66f99ba39
	Library/metadata/d6/d6e3c30d5a9f4b24983598f7ad9c1986
	Library/metadata/ee/ee897f0a868010a429a115576ec14c6f
	TER-2014-csharp.sln
	TER-2014.sln
	TER-2014.userprefs