no message
Merge branch 'master' of https://github.com/YassirDriuch/Accent

Conflicts:
	war/stage-overzicht.jsp