stoping working on topbar
Merge branch '12_1p_moreuux'

Conflicts:
	app/views/layouts/_nav.html.erb