Merge branch 'master' into elektromed

@@ -22,6 +22,8 @@ CKEDITOR.editorConfig = function( config ) {
         {name: 'basicstyles', items: ['Bold', 'Italic', 'Underline', 'RemoveFormat', '-', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock']},
     ];
     
+    config.image2_alignClasses = ['cke-leftImage', 'cke-centerImage', 'cke-rightImage'];
+
     config.disableNativeSpellChecker = false;
     config.extraPlugins = 'autolink,image2,widget,widgetselection,lineutils,nbsp';
 };