Merge remote-tracking branch 'origin/oconne' into oconne

Conflicts:
	videos.html