merger, nite_controller and nite_farm -> continued.
Merge branch 'master' of https://github.com/furylynx/MAE

merger, nite_controller and nite_farm -> continued.