Add a code filter for module loop
Merge pull request #720 from griotteau/patch-loop

Add a code filter for module loop
Conditional structure Syntax

Conflicts:
	local/modules/Tinymce/Smarty/TinyMCELanguage.php
[templates] fixed french translation
Merge pull request #733 from hhamon/fr-translation-fix

[templates] fixed french translation
Thelia no longer fails if a module can't be loaded

Conflicts:
	core/lib/Thelia/Core/Thelia.php
version info enhancement
update 2.0.4.sql file
prepare version 2.0.4
update changelog
fixed cs
Merge pull request #775 from thelia/update_2.0

Update 2.0
default translation missing for "/ajax/mini-cart"
Product AddtoCard Corrections
Product AddtoCard Corrections
Product AddtoCard Corrections
Merge pull request #784 from InformatiqueProg/2.0

Fix /ajax/addCartMessage err 500
add update version in 2.0.4.sql
Merge pull request #785 from lunika/update_sql

add update version in 2.0.4.sql
Format money missing