My review of the last commit. Check all the FIXME notes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	mclient/zbrush_export.py
	mclient/zserv.py
	zclient/gui.py