Changing some login/logout flow
Fixing token issue
Merge branch 'master' of https://github.com/lucasloliveira/beauty

Conflicts:
	beauty-client/app/views/home.html