fix conflict on config.xml file
Merge branch 'master' of github.com:thelia/thelia