Interactions cleanup and logout button.
New servers
Merge branch 'master' into circular

* master:
  New servers

Conflicts:
	config/hosts