test
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-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/05951b824895f3848be1bde07fb8791a
	Library/metadata/20/20469f851e66973438494eeca79c22b1
	Library/metadata/34/3494ddea19aeff24c9bf5420d09aed1d
	Library/metadata/5a/5a33ed72a8532eb429245444d28c630b
	Library/metadata/66/66d24e77018cb9b4bbc30b7e4390c843
	Library/metadata/85/85ece79fe705a2646bec8b183aa3a5c9
	Library/metadata/9f/9fe64c8b29fca534ca655480e8101792
	Library/metadata/a5/a5bb6d7f702b144408661eb792cb2e36
	Library/metadata/b8/b877e12b1a870b34fa44b7a3a5c6cbe1
	Library/metadata/bf/bf83e9e74dba58b4f8b602cfa331c1db
	Library/metadata/c0/c0d503575d866af40bc8acef28077aae
	Library/metadata/ca/ca84db66cec56b841b7189a66f99ba39
	Library/metadata/d6/d6e3c30d5a9f4b24983598f7ad9c1986
	Library/metadata/ee/ee897f0a868010a429a115576ec14c6f
	TER-2014-csharp.sln
	TER-2014.sln