New video gallery for Makerfaire
Merge branch 'bolson'

Conflicts:
	plugins/public-pages/makers.php