zheng
Merge branch 'chong' into dev
change addModel
Merge branch 'chong' into dev