(dev) add server client integration
Merge pull request #41 from cmccloud/dev/integration_test

(dev) add server client integration