UI change
markdown editor
merge
Merge branch 'feature/fix_travis' into develop
Merge branch 'master' into develop
add epiceditor
signup backend change
signup backend change2
something before signup
Merge remote-tracking branch 'changyou/master'

Conflicts:
	app/styles/main.css
	app/views/index.html
Add UMeditor
merge from changyou
Merge pull request #7 from meterler/master

登录页美化+注册页后台修改
add user module
Merge pull request #11 from xiaoliang2535/master

add user module
do merge
Merge branch 'master' of github.com:changyou/xocean

Conflicts:
	app/styles/main.css
Add umeditor
Add working list
Add work form