Merge pull request #491 from arnaudbey/keep-distractors

now keep distractor in tlcml
fix #490 taille V/F/ND
Merge pull request #492 from ericvincenterv/pilote3

fix #490 taille V/F/ND
Merge branch 'master' of https://github.com/InnovaLangues/self into keep-distractors

Conflicts:
	src/Innova/SelfBundle/Resources/views/Editor/listQuestionnaires.html.twig