STORY #16: 页面调试
Merge branch 'dev' of github.com:cnepaycd/QYBUser into dev

Conflicts:
	app/controllers/application_controller.rb
STORY #16: 修改密码和绑定手机错误提示
Merge branch 'dev' of github.com:cnepaycd/QYBUser into dev