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

Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php

modules/blocklayered/blocklayered.php

@@ -1925,7 +1925,7 @@ class BlockLayered extends Module
 									$(\'#error-treeview\').hide();
 								updElements(0, 0);
 							},
-							\'onComplete\': function() {
+							\'afterLoad\': function() {
 								lock_treeview_hidding = true;
 								$(\'#categories-treeview\').parent().parent().show();
 								if($($(\'#categories-treeview li\')[0]).attr(\'cleaned\'))
@@ -1934,9 +1934,7 @@ class BlockLayered extends Module
 								$($(\'#categories-treeview li\')[0]).removeClass(\'static\');
 								$($(\'#categories-treeview li span\')[0]).trigger(\'click\');
 								$($(\'#categories-treeview li\')[0]).children(\'div\').remove();
-								$($(\'#categories-treeview li\')[0]).
-									removeClass(\'collapsable lastCollapsable\').
-									addClass(\'last static\');
+								$($(\'#categories-treeview li\')[0]).removeClass(\'collapsable lastCollapsable\');
 								$(\'.hitarea\').live(\'click\', function(it)
 								{
 									$(this).parent().find(\'> .category_label\').click();