follows and video
Merge branch 'master' of https://github.com/antoinerapy/uniiti

Conflicts:
	includes/popins/dashboard_video.tpl.php