ajax edit pages
Merge branch 'develop'