toolbar api update
Merge branch 'master' of github.com:aldryn/aldryn-blog

Conflicts:
	aldryn_blog/cms_toolbar.py