client/server, demo fixes.
Merge branch 'master' of https://github.com/furylynx/MAE

Conflicts:
	libmae_demo/Release/libmae_demo.so