Signed-off-by: edhuacao <edhuacao@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloWorld/src/struts.xml