Javadoc
Merge branch 'master' of https://github.com/cod-insa/public-2014