edit price
Merge branch 'hotfix/edit_price'

* hotfix/edit_price:
  edit price
Merge branch 'hotfix/edit_price' into develop

* hotfix/edit_price:
  edit price
  fix sharing for user lectures
  fix user lectures
price edited
remove parnter
Merge branch 'hotfix/edit_price_on_main_page' into develop

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

* 'develop' of github.com:ulmic/nastachku:
  fix plaha
  fix plaha
  fix plaha
  fix encoding
  load models in initializers
  fix bug with invisible flashes
  remove fragment cache from welcome index
  fix javascript

Conflicts:
	app/views/layouts/web/shared/_plaha.html.haml