Merge with master (Conflict)

templates/default/password.html

@@ -1,6 +1,5 @@
 {extends file="layout.tpl"}
 
-<<<<<<< HEAD
 {* Body Class *}
 {block name="body-class"}page-password{/block}
 
@@ -9,16 +8,6 @@
     {$breadcrumbs = [
         ['name' => {intl l="Password"}, 'link'=>{url path="/password"}]
     ]}
-=======
-{block name="breadcrumb"}
-    <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
-        <strong id="breadcrumb-label">{intl l="You are here"} </strong>
-        <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Password"}</span></li>
-        </ul>
-    </nav><!-- /.nav-breadcrumb -->
->>>>>>> master
 {/block}