Merge remote-tracking branch 'origin/FixCookie'
Removing server tab and related test
Merge pull request #627 from bryanjhogan/master

Removed server tab