switching to gitflow
[jgitflow-plugin]updating poms for Sprint_17-SNAPSHOT development
Merge branch 'develop'

Conflicts:
	pom.xml
[jgitflow-plugin]updating poms for branch 'Sprint_16.1' with snapshot versions
[jgitflow-plugin]updating poms for branch'release-Sprint_16.1' with non-snapshot versions
Merge branch 'release-Sprint_16.1'