Extracted searchChoice method to be more generic.  Fixed syntax errors in create page.
Merge remote-tracking branch 'origin/JSF2_local' into JSF2_local

Conflicts:
	src/src/edu/wayne/cs/raptor/EncounterService.java
Re-added evans methods to encounterservice
Merge remote-tracking branch 'origin/JSF2_local' into JSF2_local

Conflicts:
	src/WebContent/create.xhtml