Javadoc et corrections checkstyle
Merge