Fixed pom.xml configuration
Merge branch 'master' into jat-frankfurt-2