diff --git a/app/config/config.yml b/app/config/config.yml
index e6b6e88a10..3803bdf951 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -16,6 +16,7 @@ imports:
     - { resource: fos/fos_rest.yml }
     - { resource: fos/fos_user.yml }
     #- { resource: fos/fos_elastica.yml }
+    - { resource: fos/fos_message.yml }
 
     # Sonata Core Bundles
     - { resource: sonata/sonata_block.yml }
@@ -58,6 +59,7 @@ framework:
     http_method_override: true
     session:
         cookie_lifetime: 1440
+    http_method_override: true
 
 # Twig Configuration
 twig:
@@ -204,3 +206,7 @@ sensio_framework_extra:
     view:    { annotations: false }
     router:  { annotations: true }
     request: { converters:  true }
+
+
+avanzu_admin_theme:
+    bower_bin: /usr/bin/bower # that's the default value
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 0b6bb61297..c1ff219a0e 100755
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -32,3 +32,18 @@ assetic:
 
 #swiftmailer:
 #    delivery_address: me@example.com
+
+
+web_profiler_extra:
+    routing:
+        enabled:        true
+        display_in_wdt: true
+    container:
+        enabled:        true
+        display_in_wdt: true
+    assetic:
+        enabled:        true
+        display_in_wdt: true
+    twig:
+        enabled:        true
+        display_in_wdt: true
diff --git a/app/config/fos/fos_message.yml b/app/config/fos/fos_message.yml
new file mode 100755
index 0000000000..08bcd78824
--- /dev/null
+++ b/app/config/fos/fos_message.yml
@@ -0,0 +1,15 @@
+fos_message:
+    db_driver: orm
+
+    thread_class: ChamiloLMS\CoreBundle\Entity\Thread
+    message_class: ChamiloLMS\CoreBundle\Entity\Message
+
+fos_comment:
+    db_driver: orm
+    class:
+        model:
+            comment: ChamiloLMS\CoreBundle\Entity\Comment
+            thread: ChamiloLMS\CoreBundle\Entity\Thread
+
+assetic:
+    bundles: [ "FOSCommentBundle" ]
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 4f28b35dab..4e9eedf598 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -13,6 +13,39 @@ _api:
     resource: routing_api.yml
     prefix:   /api
 
+fos_message:
+    resource: "@FOSMessageBundle/Resources/config/routing.xml"
+    prefix: /messages
+
+fos_comment_api:
+    type: rest
+    resource: "@FOSCommentBundle/Resources/config/routing.yml"
+    prefix: /api
+    defaults: { _format: html }
+
+#avanzu_admin_all_messages:
+#    path: /messages/
+#avanzu_admin_show_message:
+#    path: /messages/{messageid}/
+#
+#avanzu_admin_all_notifications:
+#    path: /notifications/
+#avanzu_admin_show_notification:
+#    path: /notifications/{notifyid}/
+#
+#avanzu_admin_all_tasks:
+#    path: /tasks/
+#avanzu_admin_show_task:
+#    path: /tasks/{taskid}/
+#
+
+#avanzu_admin_logout:
+#    path: /logout
+
+avanzu_admin:
+    resource: "@AvanzuAdminThemeBundle/Resources/config/routes.yml"
+
+# Always at the end
 core_bundle:
     resource: "@ChamiloLMSCoreBundle/Resources/config/routing.yml"
 
diff --git a/app/config/sonata/sonata_admin.yml b/app/config/sonata/sonata_admin.yml
index 107194f4c1..57640e42a8 100644
--- a/app/config/sonata/sonata_admin.yml
+++ b/app/config/sonata/sonata_admin.yml
@@ -32,7 +32,7 @@ sonata_admin:
             - { position: center, type: sonata.timeline.block.timeline, settings: { context: SONATA_ADMIN, max_per_page: 25 }}
             #- { position: center, type: sonata.news.block.recent_posts, settings: { title: Recent Posts, number: 7, mode: admin }}
             - { position: left, type: sonata.block.service.text, settings: { content: "<div class='panel panel-default'><div class='panel-heading'><h3 class='panel-title'>Welcome!</h3></div><div class='panel-body'>You can customize this dashboard by editing the <code>sonata_admin.yml</code> file. The current dashboard presents the recent items from the NewsBundle and a non-statistical e-commerce information.</div></div>"} }
-            #- { position: center, type: sonata.news.block.recent_comments, settings: { title: Recent Comments, number: 7, mode: admin }}
+            - { position: center, type: sonata.news.block.recent_comments, settings: { title: Recent Comments, number: 7, mode: admin }}
             #- { position: right, type: sonata.order.block.recent_orders, settings: { title: Recent Orders, number: 5, mode: admin }}
             #- { position: right, type: sonata.customer.block.recent_customers, settings: { title: Recent Customers, number: 5, mode: admin }}
             #- { position: right, type: sonata.block.service.rss, settings: { title: Sonata Project's Feeds, url: http://sonata-project.org/blog/archive.rss }}
@@ -48,7 +48,7 @@ sonata_admin:
                     - sonata.news.admin.post
                     - sonata.media.admin.media
                     - sonata.media.admin.gallery
-                    #- sonata.comment.admin.thread
+                    - sonata.comment.admin.thread
             #sonata.admin.group.ecommerce:
              #   label:           sonata_ecommerce
               #  label_catalogue: SonataAdminBundle
diff --git a/app/config/sonata/sonata_page.yml b/app/config/sonata/sonata_page.yml
index e47362b70f..ea7918daa9 100644
--- a/app/config/sonata/sonata_page.yml
+++ b/app/config/sonata/sonata_page.yml
@@ -17,11 +17,14 @@ sonata_page:
     ignore_uri_patterns:
         - ^/admin(.*)
         - ^/api/(.*)
+        - ^demo-admin/(.*)
+        - ^avanzu_admin
 
     ignore_route_patterns:
         - (.*)admin(.*)     # ignore admin route, ie route containing 'admin'
         - ^_(.*)            # ignore symfony routes
         - index
+        - (.*)avanzu_admin(.*)
 
     ignore_routes:
         - sonata_page_cache_esi
diff --git a/app/config/sonata/sonata_user.yml b/app/config/sonata/sonata_user.yml
index c347a2edc8..e7ce2b8d14 100644
--- a/app/config/sonata/sonata_user.yml
+++ b/app/config/sonata/sonata_user.yml
@@ -34,15 +34,15 @@ sonata_user:
         dashboard:
             blocks:
                 - { position: left, type: sonata.block.service.text, settings: { content: "<h2>Welcome!</h2> <p>This is a sample user profile dashboard, feel free to override it in the configuration! Want to make this text dynamic? For instance display the user's name? Create a dedicated block and edit the configuration!</p>"} }
-                - { position: left, type: sonata.order.block.recent_orders, settings: { title: Recent Orders, number: 5, mode: public }}
+                #- { position: left, type: sonata.order.block.recent_orders, settings: { title: Recent Orders, number: 5, mode: public }}
                 - { position: right, type: sonata.timeline.block.timeline, settings: { max_per_page: 15 }}
                 - { position: right, type: sonata.news.block.recent_posts, settings: { title: Recent Posts, number: 5, mode: public }}
                 - { position: right, type: sonata.news.block.recent_comments, settings: { title: Recent Comments, number: 5, mode: public }}
         menu:
             - { route: 'sonata_user_profile_show', label: 'sonata_profile_title', domain: 'SonataUserBundle'}
             - { route: 'sonata_user_profile_edit', label: 'link_edit_profile', domain: 'SonataUserBundle'}
-            - { route: 'sonata_customer_addresses', label: 'link_list_addresses', domain: 'SonataCustomerBundle'}
-            - { route: 'sonata_order_index', label: 'order_list', domain: 'SonataOrderBundle'}
+            #- { route: 'sonata_customer_addresses', label: 'link_list_addresses', domain: 'SonataCustomerBundle'}
+            #- { route: 'sonata_order_index', label: 'order_list', domain: 'SonataOrderBundle'}
         form:
             type:                 sonata_user_profile
             handler:              sonata.user.profile.form.handler.default