Merge pull request #1 from changyou/master

merge
Create README.md
Merge pull request #2 from changyou/master

pull changyou master
remove error testcase body
use firefox instead chrome in karma test (for travis ci
change db init compatibility with test
trigger travis
add readme and travis badge
UI change
Merge pull request #3 from maplebaby/master

优化顶部导航，去掉页脚
Merge branch 'feature/fix_travis' of https://github.com/bitdewy/xocean into bitdewy-feature/fix_travis

Conflicts:
	README.md
Merge pull request #5 from maplebaby/master

增加发件人和抄送人自动提示
markdown editor
merge
Merge branch 'feature/fix_travis' into develop
Merge pull request #3 from changyou/master

merge changyou/master
Merge branch 'master' into develop
add epiceditor
signup backend change
signup backend change2