Correction
Merge branch 'master' of https://github.com/GuGarcia/ptut-eklerni
Correction
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Eklerni/BackBundle/Resources/translations/messages.en.xlf
	src/Eklerni/BackBundle/Resources/translations/messages.fr.xlf
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Eklerni/BackBundle/Resources/translations/messages.en.xlf
	src/Eklerni/BackBundle/Resources/translations/messages.fr.xlf