Finish sign in with username
Merge branch 'sign-in-with-username'

Conflicts:
	app/models/user.rb
	spec/acceptance/steps/steps.rb
	spec/factories/users.rb