fix scm tag
[maven-release-plugin] prepare release Sprint_14-1.0
[maven-release-plugin] prepare for next development iteration
fix version tags that maven misses
trying to force a conflict during merge
Merge branch 'master' into develop

Conflicts:
	pom.xml