Fixed ImportError caused by #108 and #109
Merge branch 'master' into 125-publication-api-read-only-create-custom-html-api