Merge branch 'master' of https://github.com/nfqakademija/Gurme

Conflicts:
	src/Gurme/MainBundle/Controller/FrontEndController.php
	src/Gurme/MainBundle/Resources/views/Default/calories.html.twig
	src/Gurme/MainBundle/Resources/views/Default/recipe.html.twig
	src/Gurme/MainBundle/Resources/views/Default/recipes.html.twig
Merge remote-tracking branch 'origin/master'