Merge branch 'master' into tax

Conflicts:
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/thelia.sql
	local/config/schema.xml

local/config/schema.xml

@@ -844,18 +844,18 @@
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="code" required="true" size="45" type="VARCHAR" />
     <column name="type" required="true" size="255" type="VARCHAR" />
+    <column name="amount" required="true" type="FLOAT" />
     <column name="title" required="true" size="255" type="VARCHAR" />
+    <column name="is_enabled" required="true" type="BOOLEAN" />
     <column name="short_description" required="true" type="LONGVARCHAR" />
     <column name="description" required="true" type="CLOB" />
-    <column name="amount" required="true" type="FLOAT" />
-    <column name="is_used" required="true" type="TINYINT" />
-    <column name="is_enabled" required="true" type="TINYINT" />
     <column name="expiration_date" required="true" type="TIMESTAMP" />
-    <column name="serialized_rules" required="true" type="LONGVARCHAR" />
-    <column name="is_cumulative" required="true" type="TINYINT" />
-    <column name="is_removing_postage" required="true" type="TINYINT" />
     <column name="max_usage" required="true" type="INTEGER" />
+    <column name="is_cumulative" required="true" type="BOOLEAN" />
+    <column name="is_removing_postage" required="true" type="BOOLEAN" />
     <column name="is_available_on_special_offers" required="true" type="BOOLEAN" />
+    <column name="is_used" required="true" type="BOOLEAN" />
+    <column name="serialized_conditions" required="true" type="LONGVARCHAR" />
     <unique name="code_UNIQUE">
       <unique-column name="code" />
     </unique>