Merge with master

templates/default/password.html

@@ -1,5 +1,6 @@
 {extends file="layout.tpl"}
 
+<<<<<<< HEAD
 {* Body Class *}
 {block name="body-class"}page-password{/block}
 
@@ -8,6 +9,16 @@
     {$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}
 
 
@@ -18,7 +29,7 @@
             {form name="thelia.customer.lostpassword"}
             <form id="form-forgotpassword" action="{url path="/password"}" method="post" role="form">
 
-                <p>{intl l="Please enter your email address below." {intl l="You will receive a link to reset your password."}</p>
+                <p>{intl l="Please enter your email address below."} {intl l="You will receive a link to reset your password."}</p>
                 {form_field form=$form field="email"}
                 <div class="form-group group-email {if $error}has-error{elseif !$error && $value != ""}has-success{/if}">
                     <label for="{$label_attr.for}">{$label}</label>