use recipient by Moe
Merge branch 'master' of https://github.com/meterler/xocean

Conflicts:
	app/styles/main.css
	lib/controllers/users.js
去除不必要代码
Merge pull request #17 from fengliu222/master

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

Conflicts:
	app/styles/main.css
Merge branch 'master' of https://github.com/fengliu222/xocean

Conflicts:
	app/styles/main.css
	lib/controllers/users.js
merge from ade
merge from xiaoliang
fix email bug