Remove tabs
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/servers/servers.html
Remove tabs