switch back to proper data-server
Merge pull request #1932 from birarda/master

switch back to proper data-server
fix a bad cast to Assignment, closes #1935
fix miss of pingType in timePingReply, closes #1934
Merge pull request #1936 from birarda/master

fix a bug in domain-server and ping timing
Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting