pure ws changes
regen the templates
Merge pull request #77 from google/devoncarew_ws_2

Devoncarew ws 2