Fix logout button
Merge branch 'master' into fix/32/logout-button-redirect

Conflicts:
	Gemfile.lock
Merge pull request #32 from ZeusWPI/fix/32/logout-button-redirect

Fix logout button