modal_content
Merge remote-tracking branch 'origin/mainone' into index_background

Conflicts:
	WebContent/common/modal_content.jsp