fixed deadlock in server by adding timeout to reactors select call
Merge branch 'master' of github.com:TIARDI/ARDI