this fixes an issue where reloadBrowser can't be overwritten due to over-namespacing and over-rewriting of cms.base.js
Merge branch 'develop' of github.com:divio/django-cms into develop
remove twitter js file as per pull request #2011
Merge pull request #2016 from FinalAngel/develop

Fixes issues with reloadBrowser in closeFrame.html and removes twitter js file
move_plugin now requires plugin_language
plugin_language is optional now
Merge pull request #2021 from digi604/fix-move

move_plugin now requires plugin_language