Merge remote-tracking branch 'origin/DanM'

Conflicts:
	css/main.css
Merge remote-tracking branch 'origin/master' into Dan

Conflicts:
	templates/main.tpl
Merge remote-tracking branch 'origin/master' into Dan
Merge remote-tracking branch 'origin/master' into Dan

Conflicts:
	templates/main.tpl
added EGB to VGSpotlight slide