change status after signup
signup change hashedpassword
Merge pull request #16 from fengliu222/master

将收件人和抄送人的输入框封装为directive
Merge remote-tracking branch 'changyou/master'
login page add background-image
Merge branch 'master' of https://github.com/meterler/xocean

Conflicts:
	app/styles/main.css
	lib/controllers/users.js
去除不必要代码