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

Conflicts:
	app/Resources/scripts/script.js