set active menu item
Merge branch 'master' of github.com:mbaniasad/industrial_site

Conflicts:
	app/views/shared/_menu_bar.html.haml