update to latest version of weiyu
Merge branch 'sync-shortcuts'