tset
Merge branch 'master' of https://github.com/blackcop/WebServiceDemo.git
Merge branch 'master' of https://github.com/blackcop/WebServiceDemo.git
coupon
test
Merge branch 'master' of https://github.com/blackcop/WebServiceDemo.git
2013.5.20
Merge branch 'master' of https://github.com/blackcop/WebServiceDemo.git

Conflicts:
	.classpath
	src/main/java/org/example/ws/bean/Coupon.java