Merge remote-tracking branch 'upstream/develop' into aria

diff --cc view/theme/frio/php/standard.php
Simple merge

diff --cc view/theme/frio/templates/field_checkbox.tpl
index e993e5adb75b5affcb962693da175c351605696b,5dc8916666021eb740aafcaea7eab5c6d037c8be..2391506b1b4badd6c08858bdfc0265a80a66166e
--- 1/view/theme/frio/templates/field_checkbox.tpl
--- 2/view/theme/frio/templates/field_checkbox.tpl
+++ b/view/theme/frio/templates/field_checkbox.tpl
@@@ -1,9 -1,11 +1,11 @@@
  
        <div class="field checkbox" id="div_id_{{$field.0}}">
                        <input type="hidden" name="{{$field.0}}" value="0">
 -                      <input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="1" {{if $field.2}}checked="checked"{{/if}} aria-checked="{{if $field.2}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_tip" {{if $field.4}}{{$field.4}}{{/if}}>
 +                      <input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="1" {{if $field.2}}checked="checked"{{/if}} aria-checked="{{if $field.2}}true{{else}}false{{/if}}" {{if $field.4}}aria-describedby="{{$field.0}}_tip"{{/if}} {{if $field.4}}{{$field.4}}{{/if}}>
                        <label for="id_{{$field.0}}">
                                {{$field.1}}
-                               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+                               {{if $field.3}}
+                               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
+                               {{/if}}
                        </label>
        </div>

diff --cc view/theme/frio/templates/nav.tpl
index 87b0d101554f6c4432be609d9c80af84acbe353a,06b43f6b1584dd4f3c0e8f012517528ac003cd4c..b495fdae4e37fa315b06727f2755171e6573f9f7
--- 1/view/theme/frio/templates/nav.tpl
--- 2/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@@ -69,9 -69,9 +69,9 @@@
  
                                        {{* The notifications dropdown *}}
                                        {{if $nav.notifications}}
-                                               <li id="nav-notification" class="nav-segment hidden-xs" role="presentation">
-                                                       <a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" aria-label="{{$nav.notifications.1}}" title="{{$nav.notifications.1}}" role="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-controls="nav-notifications-menu">
-                                                               <i class="fa fa-exclamation-circle fa-lg" aria-hidden="true"></i>
+                                               <li id="nav-notification" class="nav-segment" role="presentation">
 -                                                      <a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" data-toggle="tooltip" aria-label="{{$nav.notifications.1}}" title="{{$nav.notifications.1}}" role="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
++                                                              <a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" data-toggle="tooltip" aria-label="{{$nav.notifications.1}}" title="{{$nav.notifications.1}}" role="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-controls="nav-notifications-menu">
+                                                               <i class="fa fa-bell fa-lg" aria-hidden="true"></i>
                                                                <span role="menuitem" class="sr-only">{{$nav.notifications.1}}</span>
                                                                <span id="notify-update" class="nav-notify-badge badge nav-notify dropdown" data-toggle="dropdown"></span>
                                                        </a>