remove the server component because ghpages build fails
Merge branch 'master' into gh-pages