update composer.json
Merge branch 'master' of
https://github.com/elmoulaoui/WebTranslatorBundle.git

Conflicts:
	composer.json