timeout removed from client/server.
Merge branch 'master' of https://github.com/furylynx/MAE

timeout removed from client/server.