Merge branch 'addpage'