combine web and services tiers into a single war

This is a temporary workaround needed because deploying these as
separate applications to cloud foundry results in the two components
having different domains; this in turn causes cross-domain scripting
problems.