LabaNiTE-Client -> continued.
Merge branch 'master' of https://github.com/furylynx/MAE

LabaNiTE-Client -> continued.