Merge form ade
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