add admin templates
Merge branch 'master' into tax
order admin integration
order admin
order admin
order admin
order admin
Merge branch 'master' into tax
fix tests
edit order form
tests for order update actions
order address changes tests
Merge branch 'master' into tax
try to fix test
call reset_install script in travis
fix tests (or not ?)
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
Merge branch 'master' into tax
Merge branch 'master' into tax

Conflicts:
	local/config/schema.xml
schema fix