Merge branch 'hotfix/fix_hall_editor'

* hotfix/fix_hall_editor:
  add require workshop attr in forms
widget edited
Merge branch 'hotfix/edit_shop_widget' into develop

* hotfix/edit_shop_widget:
  widget edited

Conflicts:
	app/views/web/accounts/_form.html.haml