-Redesigned CkEditor Plugin
Merge remote-tracking branch 'origin/master'

Conflicts:
	stukowin_curriculum/dialogs/stukowin_curriculum.js