Merge branch 'master' of https://github.com/furylynx/MAE

Conflicts:
	libmae/src/controller/kp_detector.cpp
	libmae/src/controller/kp_detector.hpp
Merge branch 'master' of https://github.com/furylynx/MAE