necessary before pull
Merge branch 'master' of https://github.com/jdebon/Neco-Project

Conflicts:
	Unity/Unity-csharp.sln
	Unity/Unity.sln

Signed-off-by: Sébastien Tromp <sebastien.tromp@gmail.com>