Gallery : categories
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/AD/GalleryBundle/Entity/Picture.php