Use the new convenience macros for the buttons at the bottom of the dialogs
Use the right class name for page settings so we don't conflict with the blog
Merge branch 'master' of github.com:punkave/apostrophe-events

Conflicts:
	views/edit.html