Andy's work, added allowed class and simplified class checking
Merge remote-tracking branch 'dive-ckeditor/lightbox-miriam' into expand-option

Conflicts:
	ckeditor/static/ckeditor/ckeditor/plugins/diveimage/dialogs/diveimage.js