cenik/favorites fix
Merge branch 'master' of https://github.com/veljamatic/podoli

Conflicts:
	public_html/templates/flatForm.hbs