Merge branch 'release/2.2.0' into develop
updating poms for 2.2.1-SNAPSHOT development
Merge branch 'master' into develop
updating poms for 2.2.1-SNAPSHOT development
Fix deprecation and javadoc warnings
Merge branch 'develop' of ssh://hi7.huygens.knaw.nl/data/git/security into develop
Add missing serialVersionUIDs
Fix unchecked cast
updating poms for 2.2.1 release
updating poms for 2.2.1 release
Merge branch 'release/2.2.1'