adding new server
removing defunct notice
Merge branch 'master' into newServer
new server change notice