Make it look like z3c.form
Merge branch 'plip-13260-step_by_step' of git://github.com/plone/plone.app.content into plip-13260-step_by_step