Merge branch 'sign-in-out'

Conflicts:
	Gemfile
	Gemfile.lock