Formatting
Merge branch 'master' of https://github.com/DajanaStiberova/zelene-recepty

Conflicts:
	resources/public/out/zelene_recepty/thumbnail.js
Auo build