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

Conflicts:
	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/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php

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

@@ -46,11 +46,11 @@
 		<script type="text/javascript">
 		$(document).ready(function() {
 			$("#group_discount_category").fancybox({
-				onStart: function () {
+				beforeLoad: function () {
 					$('#group_discount_category_fancybox').show();
 					initFancyBox();
 				},
-				onClosed: function () {
+				beforeClose: function () {
 					$('#group_discount_category_fancybox').hide();
 				}
 			});

admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl

@@ -75,6 +75,11 @@
 		{/if}
 	</fieldset>
 </div>
-
-{$customerList}
+<div class="col-lg-12">
+	<div class="panel">
+		<h3>{l s='Members of this customer group'}</h3>
+		<p>{l s='Limited to the 100th first customers.'} {l s='Please use filters to narrow your search.'}</p>
+		{$customerList}
+	</div>
+</div>
 {/block}