added fa version for prodcut table
put back freindly_id for product
fa version for services
added fa field for pictures
added fa fields for slider
Merge branch 'master' of github.com:mbaniasad/industrial_site

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/styles.css
	app/views/layouts/application.html.haml
	app/views/shared/_menu_bar.html.haml
Merge branch 'master' of github.com:mbaniasad/industrial_site