Merge pull request #179 from ojii/sane-add-plugin

Sane add plugin for divio/django-cms#3516
Fixed nested plugins

Plugins inside the text plugin were not being correctly associated with its parent because it was still submitting 'parent_id' to the backend but django-cms deprecated and removed this in https://github.com/divio/django-cms/commit/f4817756ecfc8e61f32067cb5345d03ae4ec6ecd and is now expected to use 'plugin_parent' as the POST param key.

See https://github.com/divio/django-cms/issues/3562 for detailed description of bug.
Fix error when HTMLText / AbstractText are mixed in the same model
We need the complete -even in empty- configuration to allow the cmsplugins plugin to initialize
Merge pull request #188 from jsma/nested-plugin-fix

Fixed nested plugins
Update README.rst

I believe 'AbstractText' was intended here (as opposed to 'AbstractClass').
Merge pull request #193 from mattcaldwell/patch-1

Update README.rst
Different strategy to define configuration function name
Fix code style
Merge pull request #189 from yakky/feature/fix_multiple_instances

Fix error when HTMLText / AbstractText are mixed in the same model
Merge remote-tracking branch 'origin/master' into sane-add-plugin

Conflicts:
	djangocms_text_ckeditor/static/djangocms_text_ckeditor/ckeditor_plugins/cmsplugins/plugin.js
	djangocms_text_ckeditor/templates/cms/plugins/widgets/ckeditor.html