pulled and maunally mereged, more pages and users functionality.

editing pages is not working on the backend.