forcing a conflict
Merge branch 'master' into develop

Conflicts:
	KBA-Publisher/pom.xml
Merge branch 'develop'
[maven-release-plugin] prepare release Release_1.0.1
[maven-release-plugin] prepare for next development iteration
Merge pull request #6 from Apelon-VA/master

pushing sprint work to gold