Merge branch 'master' of https://github.com/vertigo17/Cerberus

Conflicts:
	pom.xml