mae eventing -> continued.
mae_nite -> done.
Merge branch 'master' of https://github.com/furylynx/MAE

mae eventing -> continued.
mae_nite -> done.