more bug fixes
Merge branch 'ms1-integration' of https://github.com/DComm2013Network/Server into ms1-integration
Merge branch 'ms1-integration' into general
removed expectation of timestamps from client
Merge branch 'general' into ms1-integration