Merge branch 'master' into develop
Incrementing to dev version 2.2-SNAPSHOT
fixing javadoc statements
incrementing to version 2.1 ...again
Merge branch 'release-2.1'