fix toolbar tests
Merge pull request #1799 from FinalAngel/develop

Refactors buttons in frontend
Merge pull request #1800 from FinalAngel/develop

Frontend Fixes
publish button added again
Merge branch 'develop' of github.com:divio/django-cms into workflow
publish button changes
modals for some settings and tree view opens frontend
Merge branch 'develop' of github.com:divio/django-cms into develop

Conflicts:
	cms/cms_toolbar.py