add jsps, java and modify others
Merge branch 'master' of https://github.com/jessehwong/itmaster.git

Conflicts:
	src/struts.xml