moving docs into new format
Merge branch 'master' of git://github.com/plone/mockup