video, faqs, bundle ..
Merge branch 'clement' of github.com:nmacherey/ucs_software_bo_bundle

Conflicts:
	Resources/views/SoftwareInfos/faqs.show.html.twig