Change deprecated find_by in sessions_controller
Merge ../x0y0

Conflicts:
	Gemfile.lock
	app/controllers/sessions_controller.rb