changInfoProcess
Merge remote-tracking branch 'origin/function' into function

Conflicts:
	WebContent/common/modal_content.jsp