Fix logout bug
Resolve gemfile conflicts

Conflicts:
	Gemfile
	Gemfile.lock