re-add pagescontroller to master