reformatted pom.xml
Merge branch 'dev'

Conflicts:
	pom.xml
bumped the version number
added a repositories section to pom.xml
Merge branch 'dev'
changed the base-pom version back to a literal versio number