Signed-off-by: edhuacao <edhuacao@gmail.com>
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/WebContent/CategoryList.jsp
	HelloWorld/WebContent/TemplateStoreThreshold.jsp
	HelloWorld/WebContent/template_top.jsp
	HelloWorld/src/struts.xml