Improve master page cloning

Includes pull requests #38 and #39 and then refactors the master page cloning in odfCanvas a little, to clean things up