forcing a conflict
Merge branch 'master' into develop

Conflicts:
	KBA-Publisher/pom.xml
Merge branch 'develop'