Corrected a few bugs, using the project for versionning the project. VERSIONNINGCEPTION
corrected merge