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
setting up for testing
Merge branch 'master' into develop

Conflicts:
	pom.xml
test
Merge branch 'master' into develop
test