global plugingroups variable
Merge branch 'master' of https://github.com/tazogil/atma

Conflicts:
	cms/static/grappelli/tinymce/jscripts/tiny_mce/plugins/blokeur/editor_plugin.js
	cms/static/grappelli/tinymce/jscripts/tiny_mce/plugins/blokeur/editor_plugin_src.js
	cms/static/grappelli/tinymce/jscripts/tiny_mce/plugins/callage/editor_plugin.js
	cms/static/grappelli/tinymce/jscripts/tiny_mce/plugins/callage/editor_plugin_src.js
	cms/static/grappelli/tinymce/jscripts/tiny_mce/plugins/classeur/editor_plugin.js
	cms/static/grappelli/tinymce/jscripts/tiny_mce/plugins/classeur/editor_plugin_src.js
	cms/static/js/tinymce_setup.js