Merge branch 'master' into HEAD

src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig

@@ -94,7 +94,7 @@
                     </div>
                     <ul class="record_actions">
                         <li>
-                            <button type="submit" class="btn btn-save">
+                            <button type="submit" class="btn btn-save" id="form_household_comment_confirm">
                                 {{ 'Save'|trans }}
                             </button>
                         </li>

src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig

@@ -18,12 +18,12 @@
 
 {% set activeRouteKey = '' %}
 
-{% block title %}{{ 'Update details for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}{% endblock %}
+{% block title %}{{ 'Update details for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 
 {% block personcontent %}
 <div class="person-edit">
 
-    <h1>{{ 'Update details for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName|capitalize } ) }}</h1>
+    <h1>{{ block('title') }}</h1>
 
     {% form_theme form '@ChillMain/Form/fields.html.twig' %}
     {{ form_start(form) }}

src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig

@@ -23,8 +23,7 @@ This view should receive those arguments:
 - person
 #}
 
-{% block title %}{{ 'Person details'|trans|capitalize ~ ' ' ~ person.firstName|capitalize ~
- ' ' ~ person.lastName }}{% endblock %}
+{% block title %}{{ 'Person details'|trans|capitalize ~ ' ' ~ person|chill_entity_render_string }}{% endblock %}
 {#
     we define variables to include an edit form repeated multiple time across
     the page