fixed #433
some basic testing for affiliate - needs more work
.gitignore is now working
Merge branch '#433-hot-fix' into development

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/all/bootstrap_and_overrides.css.scss
	app/views/customers/_customer.html.erb
	app/views/customers/_customer_contact_info.html.erb
	app/views/customers/_customer_jobs.html.erb
	app/views/notifications/_notification.html.erb
	app/views/service_calls/_active_jobs.html.erb
	app/views/service_calls/_job_statuses.html.erb
	app/views/static_pages/_home_jobs.html.erb
	app/views/static_pages/_home_notifications.html.erb
	app/views/static_pages/welcome.html.erb
	config/database.yml
	config/locales/defaults/en.yml
	config/locales/devise.en.yml
fixed #437
Merge branch '#437-hot-fix' into development
fixed #422
Merge branch '#422-hot-fix' into development
fixed affiliate show - to display other industry
fixed #434