Merge branch 'develop' of github.com:divio/django-cms into develop
Merge branch 'develop' of github.com:divio/django-cms into develop
Merge branch 'develop' of github.com:divio/django-cms into develop
Merge branch 'develop' of github.com:divio/django-cms into develop
Merge branch 'develop' of github.com:divio/django-cms into develop
Merge branch 'develop' of github.com:divio/django-cms into develop
added option to close modal window and redirect
removed unused import
dont show breadcrumb if there is no title
Merge branch 'develop' of github.com:divio/django-cms into develop
Merge branch 'develop' of github.com:divio/django-cms into develop
new toolbar sprites
Merge pull request #1827 from alesdotio/develop

closing modal window (thanks to @yakky) & breadcrumb fix
permissions
Merge branch 'develop' into pagesettings

Conflicts:
	cms/cms_toolbar.py