完善修改用户功能
Merge branch 'master' of https://github.com/jnoodle/VZ-NPC201410

Conflicts:
	WebContent/WEB-INF/pages/manager/left.jsp
	WebContent/WEB-INF/pages/manager/users.jsp
Merge branch 'master' of https://github.com/jnoodle/VZ-NPC201410