Merge branch 'master' of https://github.com/talvi/jenkins

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/talvi/jenkins