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

Conflicts:
	admin-dev/themes/default/css/modules.css
	admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/Autoload.php
	classes/Carrier.php
	classes/Product.php
	classes/ProductSale.php
	classes/Tools.php
	classes/Validate.php
	classes/tax/TaxRulesTaxManager.php
	controllers/admin/AdminPPreferencesController.php
	controllers/admin/AdminPerformanceController.php
	install-dev/install_version.php
	js/admin_carrier_wizard.js
	modules/blockcategories/blockcategories.php
	modules/blocklayered/blocklayered.php
	modules/statsequipment/statsequipment.php
	modules/statsproduct/statsproduct.php
	modules/watermark/watermark.php
	themes/default/address.tpl
	themes/default/authentication.tpl
	themes/default/category.tpl
	themes/default/contact-form.tpl
	themes/default/css/history.css
	themes/default/header.tpl
	themes/default/js/cart-summary.js
	themes/default/js/product.js
	themes/default/mobile/order-detail.tpl
	themes/default/modules/blocksearch/blocksearch.tpl
	themes/default/modules/productcomments/productcomments.tpl
	themes/default/order-carrier.tpl
	themes/default/order-detail.tpl
	themes/default/order-opc-new-account.tpl
	themes/default/product.tpl

themes/default/css/history.css

@@ -0,0 +1,71 @@
+#history #left_column {display:none}
+#history #center_column{width:757px}
+#history #center_column h1{margin-top:20px}
+#history #center_column .title_block {
+	margin:20px 0;
+	padding:15px 20px;
+	background:#ccc
+}
+#history #center_column .title_block input {
+	position: relative;
+   top: -8px;
+	float:right;
+}
+
+.info-order {
+	margin-bottom:20px;
+}
+.info-order p {padding-bottom:10px}
+.info-order p .icon {
+	position:relative;
+	top:2px;
+	left:0
+}
+#order-list {
+	margin-bottom:20px;
+	width:100%;
+	border:1px solid #999;
+	border-bottom:none
+}
+#order-list  th {
+	padding:14px 12px;
+	color:#fff;
+	text-transform:uppercase;
+	text-shadow:0 1px 0 #000;
+	background:url(../img/bg_table_th.png) repeat-x 0 0 #999
+}
+#order-list tr.alternate_item {background-color: #f3f3f3}
+#order-list td {
+	padding:12px;
+	border-right:1px solid #e9e9e9;
+	border-bottom:1px solid #e9e9e9;
+	font-weight:bold;
+	font-size:12px;
+	vertical-align:top
+}
+#order-list td .price, #order-detail-content tbody .price {
+	white-space: nowrap;
+}
+#order-list td.history_detail {border-right:none;}
+
+#order-list .last_item td {border-bottom:1px solid #999}
+
+.adresses_bloc {margin-bottom:20px}
+.adresses_bloc .item {margin-right:60px}
+
+.detail_step_by_step {width:100%}
+.detail_step_by_step tr.last_item td {border-bottom:1px solid #999}
+
+#order-detail-content table {width:100%}
+#order-detail-content table .order_qte_input {display:none}
+#order-detail-content table tr.totalprice td {border-bottom:1px solid #999}
+#order-detail-content table tr:nth-child(even) {background:#f3f3f3;}
+
+#sendOrderMessage {margin-bottom:20px}
+#sendOrderMessage p {padding-bottom:10px}
+
+#returnOrderMessage .textarea textarea,
+#sendOrderMessage .textarea textarea {
+	width:100%;
+	border:1px solid #999
+}