Merge branch 'feature/add_autocomplete_tocompanies' into staging

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	app/assets/stylesheets/custom.css
	app/repositories/user_repository.rb
	public/favicon.ico
Merge branch 'feature/add_error_pages' into staging