small fix on Page model
Merge branch 'develop' into testing