merge index page
Merge branch 'master' of https://github.com/pli2014/duty

Conflicts:
	WebContent/index.jsp