Merge commit
Merge branch 'master' of https://github.com/villeteam/vexer.git

Conflicts:
	pom.xml