Merge branch 'master' of https://github.com/fengliu222/xocean
manage add user
manage add User
Merge branch 'master' of https://github.com/fengliu222/xocean
批量添加用户
Merge form ade
Merge branch 'master' of https://github.com/meterler/xocean

Conflicts:
	app/styles/main.css
	lib/controllers/users.js
去除不必要代码
1.merge form xiaoliang 2.Modify report schema,add 'name' field 3.Develop email template 4.Modify send email method
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
Merge branch 'master' of https://github.com/changyou/xocean
kill index
wl
Merge branch 'master' of https://github.com/xiaoliang2535/xocean
Article list done.
rm idea folder
Merge pull request #20 from meterler/master

增加工号字段+增加编辑个人信息页
merge from mengliu222