Hotfix groupid
Hotfix pom file
Merge branch 'master' into develop