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

Conflicts:
	source/src/main/webapp/WEB-INF/web.xml