images & other things
Merge branch 'master' of github.com:DigitalPublishingToolkit/toolkittest