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

merge changyou/master
Merge branch 'master' into develop
增加快速添加发件人组功能
add epiceditor
增加英文自动提示、模仿outlook
Add UMeditor
merge 备份
do merge
Merge branch 'master' of github.com:changyou/xocean

Conflicts:
	app/styles/main.css
Add umeditor
Add working list
Add work form
Merge pull request #13 from fengliu222/master

增加富文本编辑器UMeditor.
Remove useless vendor, add 'curWeek' and 'nextWeek' field to database schema
Modeify database schema
Add curWeek list
Add next week work
Todo: Fix bug