Merge branch 'hotfix/edit_shop_widget'

* hotfix/edit_shop_widget:
  widget edited
comment widget
Merge branch 'release/v29.3'

* release/v29.3: (34 commits)
  fix cs-cart helpers
  add margin top to widget
  speedup schedules
  speedup schedule
  three ifs to one case
  speedup schedule
  add cs-cart auth up to facebook auth
  fasted user lectures
  refactor shop client
  decorate in lectures/lectures
  fix cs cart
  add comment to guano
  add guano to lecture.rb
  update querys
  fix plaha
  load models in initializers
  partner added
  fix cache for unregistred
  client side rendering welcome page
  refactor authpopup view
  ...

Conflicts:
	app/views/web/accounts/_form.html.haml
Merge branch 'hotfix_cap_deploy'
Merge branch 'master' of github.com:ulmic/nastachku
fix height
Merge branch 'hotfix_fix_schedule_height_script' into develop