Bugfix
Merge
Merge branch 'master' of https://github.com/hermith/mclak_healthy_catering_project

Conflicts:
	HealthyCateringWeb/nbproject/project.properties