test
Merge remote-tracking branch 'refs/remotes/origin/wenzizone'

Conflicts:
	buikmail_worker.rb
	sendmail_client.rb
调整uploader的样式
修改上传进度条颜色及按钮
Merge remote-tracking branch 'origin/jpuyy'
1. and session
2, 修改了登陆，登陆用户名：admin@test.com,密码：12345678
1,调整上传代码
merge wenzizone into master