Trial stage menu
Trial stage menu
Trial stage menu II
Merge branch 'master' of https://github.com/hermith/mclak_healthy_catering_project

Conflicts:
	HealthyCateringWeb/web/index.xhtml
	HealthyCateringWeb/web/menu.xhtml
	HealthyCateringWeb/web/resources/template/template_header.xhtml