Remove (almost) all traces of webapp, WEBAPP, MARKETPLACE (bug 974850)
Merge pull request #7 from diox/remove-marketplace-and-webapps

Remove (almost) all traces of webapp, WEBAPP, MARKETPLACE (bug 974850)