Navigation styles
Merge branch 'videos' into develop

Conflicts:
	css/style.css
	less/makercon/navigation.less