Merge remote-tracking branch 'origin/master' into issue491_thirdparty_edit_modal

src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss

@@ -11,3 +11,7 @@ $chill-household-context: #929d69;
 $social-issue-color: #4bafe8;
 $social-action-color: $orange;
 $activity-color: yellowgreen;
+
+// budget colors
+$budget-resource-color: #6d9e63;
+$budget-charge-color: #e03851;

src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig

@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
         <div class="container-fluid">
             <div class="col-10 push-1">
                 <h2>{{ 'Welcome to the admin section !'|trans }}</h2>

src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig

@@ -25,7 +25,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
         <h1>{{ 'Permissions management of your chill installation' |trans }}</h1>
     {% endblock %}
 {% endblock  %}