Merge branch 'development' into identity

Conflicts:
	app/controllers/sessions_controller.rb
	app/models/user.rb
	config/application.rb
	config/initializers/omniauth.rb
	config/routes.rb
	db/schema.rb
	spec/features/authentication_spec.rb
	spec/models/user_spec.rb