add by liule for UI
no message
Merge branch 'master' into liule_06_13
Merge pull request #1 from LeLiu/liule_06_13

Liule 06 13