nav changes
Merge branch 'master' of ssh://git@github.com/chinesecold/WebService.git
grantloan layout
Merge branch 'master' of ssh://git@github.com/chinesecold/WebService.git

Conflicts:
	WebService/src/edu/cmu/ebiz/task8/basic/Constants.java
Merge branch 'master' of ssh://git@github.com/chinesecold/WebService.git
policy
Merge branch 'master' of ssh://git@github.com/chinesecold/WebService.git

Conflicts:
	WebService/WebContent/simplesearch.jsp
Merge branch 'master' of ssh://git@github.com/chinesecold/WebService.git
Merge branch 'master' of ssh://git@github.com/chinesecold/WebService.git
test
Merge branch 'master' of ssh://git@github.com/chinesecold/WebService.git

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