Categories menu
Merge branch 'master' of https://github.com/alexeiti/eventoris

Conflicts:
	eventorisMvc/src/main/webapp/WEB-INF/jsp/events.jsp