Added editor pagees
Merge branch 'master' into development