merge
Merge branch 'videoManager' of https://github.com/SulivanDotEu/healthandfood into videoManager

Conflicts:
	nbproject/private/private.xml
	web/css/admin.css