Merge remote-tracking branch 'duty/master'

Conflicts:
	WebContent/index.jsp
Merge remote-tracking branch 'duty/master'