0425 get user data & update
Merge branch 'ylc'
Merge branch 'lowlow'

Conflicts:
	WebContent/js/UserUpdate.js
0506 界面OK