toggle option
Merge remote-tracking branch 'dive-ckeditor/lightbox-miriam' into expand-option

Conflicts:
	ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js
Merge branch 'lightbox-miriam' of https://github.com/industrydive/django-ckeditor into expand-option
allow expandable-type attribute
Merge pull request #1 from aterkik/expand-option

allow data-expandable-type attribute