hello commit foireux
Merge branch 'master' of https://github.com/creationjeuxjava/BackToTheMOON

Conflicts:
	BackToTheMOON-csharp.sln
	BackToTheMOON.sln
	BackToTheMOON.userprefs
Merge origin/master

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
	BackToTheMOON-csharp.sln
	BackToTheMOON.sln
	BackToTheMOON.userprefs