no more delay feature. Hide everything about it
Merge branch 'master' into devMatthieu

Conflicts:
	src/Ema/RgementBundle/Resources/config/services.yml
Correct merge error
Correct merge error
Merge pull request #72 from EmaInfres5ED/devMatthieu

Dev matthieu