Merge branch 'master' into frontend

Conflicts:
	templates/backOffice/default/folder-edit.html

templates/backOffice/default/coupon-read.html

@@ -27,7 +27,7 @@
                     {if !$IS_ENABLED}
                         <div class="alert alert-info">
                             <span class="glyphicon glyphicon-question-sign"></span>
-                            {intl l='This coupon is disabled, you can enable to the bottom of this form.'}
+                            {intl l='This coupon is disabled, you can enable at the bottom of this form.'}
                         </div>
                     {/if}
                     

templates/backOffice/default/folder-edit.html

@@ -119,12 +119,16 @@
                                             </div>
 						                </div>
 
-                                        {include
-                                            file="includes/inner-form-toolbar.html"
-                                            hide_flags = true
-
-                                            close_url="{url path='/admin/folders' folder_id=$folder_id}"
-                                        }
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                                <div class="control-group">
+                                                    <lablel>&nbsp;</lablel>
+                                                    <div class="controls">
+                                                        <p>{intl l='Folder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</p>
+                                                    </div>
+                                                 </div>
+                                            </div>
+                                        </div>
 
                                         <small>{intl l='Colder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</small>
 

templates/backOffice/default/image-edit.html

@@ -46,7 +46,7 @@
 
         					            	{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
 
-                                            <p class="title title-without-tabs">{intl l="Image informations"}</p>
+                                            <p class="title title-without-tabs">{intl l="Image information"}</p>
 
                                             <div class="row">
                                                 <div class="col-md-6">

templates/backOffice/default/includes/content-folder-management.html

@@ -7,7 +7,7 @@
                     <form method="POST" action="{url path='/admin/content/folder/add'}" id="related_content_form">
 
                         <p class="title title-without-tabs">{intl l='Additional Folders'}</p>
-                        <p>{intl l='A content could be attached to more than one folder. Select here the additional fodlers for this content.'}
+                        <p>{intl l='A content could be attached to more than one folder. Select here the additional folders for this content.'}
                             {loop name="default_folder" type="folder" id=$DEFAULT_FOLDER}
                             {intl l='You can change the default folder (%title) in the "General" tab.' title=$TITLE}
                             {/loop}

templates/backOffice/default/taxes-rules.html

@@ -25,7 +25,7 @@
 
                     <div class="alert alert-info">
                         <p>{intl l="In order to manges your shop taxes you can manage"} <strong>{intl l="taxes"}</strong> {intl l="and"} <strong>{intl l="tax rules"}</strong>.</p>
-                        <p>{intl l="Taxes define the amount of money which is add to a bought product."}</p>
+                        <p>{intl l="Taxes define the amount of money which is added to a bought product."}</p>
                         <p>
                             {intl l="Example :"}
                         <ul>