Merge branch 'master' of heroku.com:envato-hilander

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/sessions_controller.rb
	config/initializers/omniauth.rb
	config/routes.rb
Merge branch 'master' of github.com:ejoubaud/highlander

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/omniauth.rb
	config/routes.rb