update
Merge branch 'master' of git://github.com/remithomas/rt-translation

Conflicts:
	src/RtTranslation/Controller/TranslationController.php
	src/RtTranslation/Form/LocaleForm.php
	src/RtTranslation/Service/TranslationService.php