Merge branch 'develop'
pom.xml 1.7 -> 1.8
Merge branch 'hotfix/maven-jdk-version' into develop