Solve conflicts
Merge branch 'master' of https://github.com/chinesecold/WebService.git

Conflicts:
	WebService/src/edu/cmu/ebiz/task8/controller/SimpleSearchAction.java
	WebService/src/edu/cmu/ebiz/task8/model/SearchDAO.java