Merge branch 'release/0.1'
Ensuring build for java 1.6
Merge branch 'hotfix/0.1.1' into develop
changed java build version