Merge server update

Edits made on GitHub directly.
Merge branch 'master' of https://github.com/krhoyt/Kaazing