java 6
refactoring
Merge branch 'develop' into rodin3