get the history correct
Merge branch 'master' of github.com:plone/mockup-training