Merge branch 'release/1.0.8-r1685' into develop
bumped version for next development
fixed some javadoc issues (enough to compile with java 8)
Merge branch 'feature/fixjavadoc' into develop
bumped version
changed version
Merge branch 'release/1.1.1-r1685'