reformatted pom.xml
Merge branch 'dev'

Conflicts:
	pom.xml