asdf
asdf

Merge branch 'master' of github.com:pmreil/STAs

Conflicts:
	app/controllers/company_industry_controller.rb
changes to homepage mapy
added images