Merge branch 'hotfix/edit_pages_show_view'

* hotfix/edit_pages_show_view:
  edit plaha view
edited
Merge branch 'hotfix/edit_pages' into develop

* hotfix/edit_pages:
  edited