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

src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php

@@ -133,10 +133,14 @@ class PageController extends Controller
                 $user.=$data->getUser()->getUsername();
             }
 
+            $icon="";
+            if($data->getFonticon())
+                $icon.="<i class='".$data->getFonticon()." fa-fw'></i>&nbsp;";
+
             array_push($output["data"],[
                 $action,
                 $data->getRoworder(),
-                $data->getName(),
+                $icon.$data->getName(),
                 $data->getPagecategory()->getName(),
                 $user
             ]);