后台测试20140704doc---BUG修改.
Merge branch 'master' of github.com:lcjiao/haidao