remove test file
..
Merge branch 'master' into liang
none
Merge branch 'master' into liang
none
company and user , completed