Merge branch 'hotfix_fix_plaha_2'
Merge branch 'hotfix/edit_price_on_main_page'

* hotfix/edit_price_on_main_page:
  remove parnter
  price edited
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  fix plaha
  fix plaha
  fix encoding

Conflicts:
	app/views/layouts/web/shared/_plaha.html.haml
Merge branch 'hotfix/edit_shop' into develop

* hotfix/edit_shop: