修改user
修改用户信息管理bug
Merge branch 'test' into dev

Conflicts:
	public/js/controllers/user.js