Merge developpement/socolissimo subdirectory to master