fix user toolbar stuffs
fix unclickable logo
Merge branch 'master' of github.com:team461WBI/website

Conflicts:
	app/assets/stylesheets/zbootstrap_and_overrides.css