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

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css

@@ -765,6 +765,11 @@ a.item-heart {
     max-width: 100%;
 }
 
+.widget-ckeditor img {
+    height:auto !important;
+}
+
+
 .frameitem {
     position: absolute;
     right: 0px;

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig

@@ -68,7 +68,7 @@
                         </div>
                     
                         <div class="panel-body">
-                            {{ alert.content|raw }}
+                            <div class="widget-ckeditor">{{ alert.content|raw }}</div>
 
                             {% if not alert.items is empty %}
                                 {% if app.user %}