修改usercenter   errormessage显示
Merge remote-tracking branch 'origin/master'

Conflicts:
	ApplicationServer/views/usercenter_layout.jade
修改usercenter   script