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/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/a5/a5bb6d7f702b144408661eb792cb2e36
	Library/metadata/c9/c9a4fe53cb38bb2419c155072f86ce3d
	TER-2014-csharp.sln
	TER-2014.sln