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

Conflicts:
	war/WEB-INF/classes/com/appspot/AccentNijkerk/listeners/ContextListener.class
Merge branch 'master' of https://github.com/YassirDriuch/Accent

Conflicts:
	war/competentielijst-overzicht.jsp