try to get jenkins working
Merge branch 'master' of https://github.com/remremrem/HyperMerchant

Conflicts:
	pom.xml