merge conflict
merge conflict
Merge branch 'master' of https://github.com/thju1011/swa.git

Conflicts:
	shop/src/test/resources/test-ds.xml