Merge branch 'master' of https://github.com/TheOctopod/Suite

Conflicts:
	pom.xml