Javadoc
Merge branch '4.0' of ssh://github.com/lfuelling/textie into 4.0