Merge från chrsan
Merge branch 'chrsan' into develop

Conflicts:
	pom.xml
Merge branch 'develop' of https://github.com/Diversify/multivaders into develop