Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Model/Product.php

install/thelia.sql

@@ -121,7 +121,6 @@ CREATE TABLE `tax`
     `id` INTEGER NOT NULL AUTO_INCREMENT,
     `type` VARCHAR(255) NOT NULL,
     `serialized_requirements` TEXT NOT NULL,
-    `is_default` TINYINT(1) DEFAULT 0,
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)
@@ -136,6 +135,7 @@ DROP TABLE IF EXISTS `tax_rule`;
 CREATE TABLE `tax_rule`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `is_default` TINYINT(1) DEFAULT 0 NOT NULL,
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`)