hot update support
codec fix(QAQ
Merge branch 'dev' into dev_web

Conflicts:
	cross_platform.py
	maclient_logging.py
yay
switch to new-style classes
Merge branch 'dev' into dev_web