Sort webservice.sql by table so it's actually understandable.
Merge branch 'webservice-sql-reordering'

* webservice-sql-reordering:
  Sort webservice.sql by table so it's actually understandable.
Merge branch 'master' into beta