poprawki
Merge branch 'master' of http://github.com/scrx/kcal

Conflicts:
	.project
	app/config/bootstrap/libraries.php
	app/controllers/ServingController.php
	app/controllers/UserController.php
	app/models/Foods.php
	app/models/UserHistoryDatas.php
	app/resources/tmp/cache/00f0b7680ec24486f6b5b17e8a75b126.core.libraries
	app/views/layouts/default.html.php