integration
Merge branch 'master' of github.com:symfou/wbi-en-avant