Merge branch 'master' of github.com:mbaniasad/industrial_site into HEAD

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/styles.css
	app/views/shared/_menu_bar.html.haml
style.css new
new one
fix design at new design
home submenu is active if current page is homepage
set font on site
commiting on test
Merge branch 'test

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/styles.css
	app/views/shared/_menu_bar.html.haml