modified:   app/controllers/users_controller.rb
Merge branch 'jsprint' of https://github.com/dreamlx/skynet into jsprint

Conflicts:
	app/controllers/users_controller.rb
修改了密码失败没有front界面错误，改动了flash警告位置