导入配置
Merge branch 'testme_20130519' of https://github.com/wangchongan/testme.git into testme_20130519
菜单调整