Refactoring for public release.
Updated web services projects
Extracting ApplicationServerWebServices
Fixed conflict