integrated web services, completed core, renamed things
integrated web services, finished core, renamed things
Merge branch 'web'