menu
Merge branch 'clinux_addwork' of https://github.com/clinux-uni/clinux-website into clinux_addwork

Conflicts:
	app/routes.php
	app/views/layouts/home.blade.php