use recipient by Moe
Merge pull request #17 from fengliu222/master

优化用户体验，改进界面交互。
Merge remote-tracking branch 'changyou/master'

Conflicts:
	app/styles/main.css
merge from ade
merge from xiaoliang
fix email bug
Merge pull request #18 from meterler/master

登录页美化+注册页后台修改
Merge branch 'master' of https://github.com/changyou/xocean
kill index