test
change
test
Merge branch 'master' of
https://github.com/xiaochenghao/J2EELearning.git

Conflicts:
	XMLUser/WebContent/a.html
	XMLUser/WebContent/b.html