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

Conflicts:
	HelloWorld/WebContent/TemplateStoreThreshold.jsp