pom.xml fixed
Merge branch 'bbZ_betaBuild' into bbZ_workspace