signup tnwjd
signup reset
rrr
Merge remote-tracking branch 'origin/mykko' into one

Conflicts:
	WebContent/changeInfoProcess.jsp
	WebContent/common/modal_content.jsp
	WebContent/js/search.js