modify pom.xml
Merge branch 'dev'