update from server 012414@cht.local
Merge branch 'cht.local' into cht