client-server fixes. LabaNiTE-* -> continued.
Merge branch 'master' of https://github.com/furylynx/MAE

client-server fixes. LabaNiTE-* -> continued.