Move personal preferances modal to widgets, so it gets loaded in
plone.app.widgets as well.
Merge branch 'master' of git://github.com/plone/mockup

Conflicts:
	js/bundles/toolbar.js