Finished edit pages functionality
Resolving merge conflicts
Created edit page functionality
Merge branch 'editpages'
Integrated edit functionality