Complete migration from web to webservice
Merge pull request #12 from walterbender/test-web-2

Complete migration from web to webservice