Merge branch 'master' into dist/envole/7/master

src/ninesurvey-1.0/config/packages/fos_ckeditor.yaml

@@ -11,10 +11,21 @@ fos_ck_editor:
         full_config:
             language: fr
             toolbar: "my_full_toolbar"
+            extraPlugins: ["html5video","youtube"]
         small_config:
             language: fr
             toolbar: "my_small_toolbar"
             removePlugins: 'elementspath'       
+    plugins:
+        youtube:
+            path:     "build/ckeditor/plugins/youtube/" 
+            filename: "plugin.js"    
+        html5video:
+            path:     "build/ckeditor/plugins/html5video/" 
+            filename: "plugin.js"    
+        pastebase64:
+            path:     "build/ckeditor/plugins/pastebase64/" 
+            filename: "plugin.js"     
     toolbars:
         configs:
             my_full_toolbar: [ "@document1", "-", "@clipboard1", "-", "@basicstyles1", "-", "@paragraph1", "/", "@links1", "-", "@insert1", "-", "@styles1", "-" , "@colors1", "-" , "@tools1" ]