did nothing
Merge branch 'master' of https://github.com/roachhuang/xinhai
fix menu item Help
menu fix
fix conflict