Merged in changes from server and modified dependencies to be submodules