Removed non-html-compliant email addresses.
Fix to javadoc.
Merge pull request #15 from SERG-Delft/javadoc

Updating some javadoc