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
[jgitflow-plugin]updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
[jgitflow-plugin]Updating develop poms back to pre merge state
Merge branch 'release-Sprint_16.1'
ready to test on maestrodev
[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'
Merge pull request #5 from Apelon-VA/master

pushing sprint work to gold