updated info for WS and CA
Merge branch 'master' into gh-pages