action are now in controller event
Merge branch 'master' of github.com:thelia/thelia

Conflicts:
	composer.lock