login and logout
Merge remote-tracking branch 'origin/master'

Conflicts:
	stable/README.md