Fixed pom.xml
Merge branch 'master' into destroy

Conflicts:
	pom.xml