Update pom.xml
Add some more stuff.
Merge origin/master