working on making server addresses configurable
Merge branch 'master' into dev
Adding remove Xs for servers