player translations
Merge remote-tracking branch 'origin/master' into translation

Conflicts:
	src/Innova/SelfBundle/Resources/views/Player/CE/situation.html.twig
	src/Innova/SelfBundle/Resources/views/Player/common/macros.html.twig
Merge pull request #248 from arnaudbey/translation

Translation