modified pom.xml
Merge branch 'master' into staging