reformatted pom.xml
added some information required by sonatype to the pom
Merge remote-tracking branch 'origin/dev'

Conflicts:
	pom.xml