Ajout du ckeditor
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Wagaia/Bundle/CMSBundle/Resources/config/admin.yml
ajout picto publication