Used parser
Merge branch 'master' into unitTest/sharon
Merge branch 'controller/sharon'
Activated help
Activated undo
Merge remote-tracking branch 'origin/logic/wenhao'
Merge remote-tracking branch 'origin/logic/wenhao'
Fixed bug
Merge branch 'master' into logic/wenhao