add Sheng to contributor list
Merge branch 'master' into develop