Merge pull request #13 from Apelon-VA/master

pushing sprint work to gold
Merge pull request #14 from Apelon-VA/master

pushing sprint work to gold
updates from develop
cleanup
fix version typo
[maven-release-plugin] prepare release master-Release_1.1.0
[maven-release-plugin] prepare for next development iteration
point back at snapshot versions
one more version change
Merge pull request #15 from Apelon-VA/master

pushing sprint work to gold
Merge branch 'develop'

Conflicts:
	config/src/main/resources/app.xml
switching to gitflow
Merge branch 'develop'
fix wrong version
[jgitflow-plugin]updating poms for branch 'Sprint_16.1' with snapshot versions
[jgitflow-plugin]updating poms for Sprint_17-SNAPSHOT development
[jgitflow-plugin]updating poms for branch'release-Sprint_16.1' with non-snapshot versions
Merge branch 'release-Sprint_16.1'
[jgitflow-plugin]updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop