diabetes info added
Merge branch 'master' of https://github.com/DusanKasan/FoodManager

Conflicts:
	app/templates/@layout.latte