Changing handling of page images

Now automatically incorporating a page image into the page layout
Merge branch 'master' into stable