Merge branch 'hotfix/logging-error2'
Fixed to java7 version again
Merge branch 'hotfix/java7fix' into develop