navbar fix
Merge branch 'master' of https://github.com/mister-burns/tvratr_v3

Conflicts:
	app/assets/javascripts/brian.js
	app/views/shows/_search_panel_beta.html.erb