assets in modules
Merge branch 'master' of github.com:thelia/thelia
asset tests
Merge branch 'master' of github.com:thelia/thelia
Merge branch 'master' into modules
assets
assets in module
Merge branch 'master' of github.com:thelia/thelia
Merge branch 'master' into modules

Conflicts:
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
assets in modules
change asset origin param name by source
fix tax rules issue
we are moving forward : no more "make it magic"
fix tax engine instance
Fixxed assets URLs (on Windows, DS is \ !)
Configure button is enabled only if module is enabled.
Renamed backoffice to backOffice
Fixed improper translations
Merge branch 'master' into modules
Added sorting and position ùmanagement to modules.