only delete plugins of current language
run python 3 tests first
increase queries to 61
Merge branch 'develop' into placeholder-clear-fix

Conflicts:
	cms/templates/cms/toolbar/dragbar.html
Merge pull request #2592 from digi604/placeholder-clear-fix

only delete plugins of current language
Merge pull request #2593 from digi604/p3-test-first

run python 3 tests first
Merge pull request #2594 from digi604/fix-query3

increase queries to 61
Update cms.modal.js

The CMS modal was not displaying correctly in Firefox or Chrome. $(window).height() posed a problem when the height of the content in the CMS modal was greater than the screen height. Replacing $(window).height() with screen.height fixed the problem. This problem could also present itself when the content width is greater than screen width - thus $(window).width() was changed to screen.width.
Document #2515
Fix for error when attempting to save static_placeholder on non-cms pages

Before this fix user receives:
AttributeError: 'NoneType' object has no attribute 'get_title'

When attempting to "Publish Changes" on a non-CMS page with static placeholders.

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
Removed remaining plugins directory

Regarding: https://github.com/divio/django-cms/pull/2581
Merge pull request #2600 from yakky/feature/render_model_doc

Document #2515
Merge pull request #2601 from mkoistinen/statics_outside_of_cms

Fix for Publish Changes on non-cms pages containing static_placeholders
Merge pull request #2604 from Chive/feature/cleanup-plugins

Removed remaining plugins directory
don't swallow ImportError due to importing app that exists

Previously get_module() would try swallow the ImportError, but there are
two causes for the ImportError - the module file doesn't exists, or
importing the module file causes an ImportError.  We want to swallow the
first but not the second.

This commit uses the imp module - imp.find_module() looks for the module
and will cause an ImportError if the module does not exist.  But it will
not actually run the file code.  So the try/except block is put around
imp.find_module().  If there was no ImportError at that point, we then
to load_module() outside the try/except block, and if that fails we die
here immediately.
Do all the module search in try/except block
Fix the new get_module()

Had the arguments inverted, and didn't previously cope with modules deep
 in the heirarchy.
Merge remote-tracking branch 'foobacca/import_fix' into fix/import-broken-plugins-2
Add test for importing broken cms_plugins
Update minimum version of djangocms-text-ckeditor for recent builds of django-cms

Using the previously recommended version of 2.0.5 results in `ImportError: No module named utils` since cms.plugins.utils has been removed.

Upgrading djangocms-text-ckeditor to 2.1.1 resolves this.

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>