Merge branch 'xpwang_test'
deleted code bar
Merge branch 'master' into xpwang_test