Updated pom.xml.
Merge branch 'develop'