Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management

# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia:
  Finished product combination basic function
  Formatted combination table

templates/admin/default/product-edit.html

@@ -135,6 +135,11 @@
         <script src="{$asset_url}"></script>
     {/javascripts}
 
+
+{javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'}
+    <script src="{$asset_url}"></script>
+{/javascripts}
+
 <script src="{url file='/tinymce/tinymce.min.js'}"></script>
 <script>
 	tinymce.init({