Fixed javadoc errors
Merge pull request #22 from SERG-Delft/javadocs

Fixed bad characters and html in Javadoc