Update pom.xml
Merge branch 'feature-release' into develop

Conflicts:
	pom.xml
	src/main/bash/release.sh