Move errors.properies to resources directory
Rebase patches to current master
Fix Javadoc warnings
Merge pull request #75 from ellert/master

Move a properties file to resource directory, rebase patches and fix javadoc warnings