Merge branch 'css'

Conflicts:
	app/controllers/users_controller.rb
	app/views/drivers/_form.html.erb
	app/views/drivers/show.html.erb
	app/views/users/index.html.erb
Added generalized search bar
company_id => Company.name
company_id => company.name
Merge branch 'master' of https://github.com/TaxiRating/Server

Conflicts:
	app/views/drivers/show.html.erb
	app/views/layouts/index/_search.html.erb
Merge branch 'master' into css