Merge branch 'feature/fix_travis' into develop
Merge pull request #3 from changyou/master

merge changyou/master
Merge branch 'master' into develop
merge 备份
add article module
Merge remote-tracking branch 'master/master' into develop
fix travis
continue fix travis
Merge pull request #15 from bitdewy/hotfix/fix_travis

Hotfix/fix travis
Merge pull request #14 from fengliu222/master

本周工作总结和下周工作列表功能可用
backup
Merge branch 'master' of https://github.com/xiaoliang2535/xocean
收件人和抄送人和邮件接口对接
merge shufeng
Make sender form to a derective