Bumped pom after release
Merge branch '1.4'
Merge branch 'master' into develop

Conflicts:
	pom.xml