wefwef
Merge branch 'bug'
awawf awf awf awf awf awf awf

Conflicts:
	struts/src/main/webapp/HelloWorld.jsp