Infowindow in Simple Search Updated
Merge branch 'master' of git@github.com:chinesecold/WebService.git
Limit result by 10, locate map after searching using the top location we
returned. Search field added,
Merge branch 'master' of git@github.com:chinesecold/WebService.git

Conflicts:
	WebService/WebContent/demographic.jsp
Merge branch 'master' of git@github.com:chinesecold/WebService.git
Solve conflicts
Conflicts:
	WebService/src/edu/cmu/ebiz/task8/controller/SimpleSearchAction.java