Add FormPage model to demo app
Merge branch 'master' into form-builder
tidy up display of rich text fields on FormPage