ajout image vaisseau
Merge branch 'master' of https://github.com/BabacarPlusPlus/TER-2014

Conflicts:
	Library/CurrentLayout.dwlt
	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/guidmapper
	Library/metadata/c7/c7de5b9bbf95df24185e1807e650463c
	TER-2014-csharp.sln
	TER-2014.sln
	TER-2014.userprefs