Signed-off-by: merry
Signed-off-by: merry <merry.guo
Merge branch 'master' of git@github.com:xuxin0612/programmer.git

Conflicts:
	struts_trainning/src/com/yourcompany/struts/form/test.java

Signed-off-by: merry