Add support for FontAwesome
Merge
Upgrade login method
Fix tests
Merge branch 'master' of github.com:CrimsonTautology/map_votes

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb
	spec/features/home_spec.rb
	spec/features/map_pages_spec.rb
	spec/models/vote_spec.rb