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

Conflicts:
	libmae_eventing/src/mae/eventing/server.hpp