Started modification of OriginServer to be used as a proxy server with minimal code changes.
merge