Fix a bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Dof/ItemsBundle/Resources/views/Sets/show.html.twig