Merge branch 'release/1.2.0' into develop
bumped snapshot
fixed java doc issues
Merge branch 'feature/fixjavadoc' into develop
fixed
fixed doc
Merge branch 'release/1.2.1'