update composer.lock file
update travis file
Merge branch 'master' of github.com:thelia/thelia