commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/jsp/common/ActionJoin.jsp
	WebContent/jsp/common/Join.jsp