update from server 020513
Merge branch 'local.cht' into master.cht