more edit pages, and view editing
Merge branch 'develop' of https://github.com/elyas-bhy/freya into develop