modal popup: jquery hide function breaks ckeditor on firefox
Merge pull request #2337 from ollb/bugfix/ckeditor_no_icons_on_firefox

modal popup: jquery hide function breaks ckeditor on firefox
Merge branch 'develop' of github.com:divio/django-cms into feature/restructure

Conflicts:
	cms/static/cms/js/plugins/cms.toolbar.js
renamings and comments