made navbar fixed
Merge branch 'development' of github.com:climbingcode/bam- into development
homepage changes
home page changes
Merge branch 'development' of github.com:climbingcode/bam- into development

Conflicts:
	app/assets/stylesheets/_asset_manager_form.scss
	app/views/brands/_form.html.erb