tidying up pom.xml
fixing dependencies issues
Merge remote-tracking branch 'origin/master'