Commit code.
Merge branch 'dev_richard_use_new_iconizer' of https://github.com/weijia/approot into dev_richard_use_new_iconizer

Conflicts:
	libs/obj_related/json_obj.py