modified pom.xml for maven deployment
Merge branch 'development'