Improve agenda views
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/js/agenda/controller.js
	src/js/agenda/views/subnav.html