Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl

@@ -50,7 +50,7 @@
 							<span class="fees_all" {if $ranges|count == 0}style="display:none" {/if}>All</span>
 						</td>
 						<td>
-							<input type="checkbox" onclick="checkAllZones(this);" >
+							<input type="checkbox" onclick="checkAllZones(this);" class="form-control">
 						</td>
 						{foreach from=$ranges key=r item=range}
 						<td class="border_top border_bottom {if $range.id_range != 0} validated {/if}"  >

controllers/admin/AdminCarrierWizardController.php

@@ -152,7 +152,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 	public function initPageHeaderToolbar()
 	{
 		parent::initPageHeaderToolbar();
-		$this->page_header_toolbar_btn = array();
+		$this->page_header_toolbar_btn['back']['href'] = $this->context->link->getAdminLink('AdminCarriers');
 	}
 
 	public function renderStepOne($carrier)