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

Conflicts:
	Assets/Scene/Jeu.unity
	Library/CurrentMaximizeLayout.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/9f/9fe64c8b29fca534ca655480e8101792
	TER-2014-csharp.sln
	TER-2014.sln
	TER-2014.userprefs