javadoc in CP
Merge branch 'master' of github.com:MartijnVerkleij/rolit