Changes
Merge branch 'master' of github.com:plone/security-mockups
Remove dodgy portlet
Oops, use my own file
Restore example.html
Get rid of edit bars