Client server dev merge with dev

Please merge this project with dev in order to provide the other teams with the framework to interface with the server. The code is currently building on my machine.