Bug fixed
Merge branch 'master' of git@github.com:chinesecold/WebService.git

Conflicts:
	WebService/src/edu/cmu/ebiz/task8/basic/Constants.java