u
Merge branch 'master' of https://github.com/tomascejka/jenkins-changeloger.git

Conflicts:
	pom.xml