Merge branch 'hotfix/logging-error'
Changed Java version to 1.7
Merge branch 'hotfix/logging-error2' into develop