commit for merging
Merge branch 'xujing' into lianglili
commit for branch checking