Fix bugs
Fix sf 2.3
Merge branch 'master' of https://github.com/ZhukV/TranslationExtraBundle