Merge branch 'JQuery' into Addition-of-JQuery-etc

Conflicts:
	src/libs/databaseCreationScript.sql

pharm search
Merge remote-tracking branch 'origin/JSF2_local' into JSF2_local

Conflicts:
	src/WebContent/pharm.xhtml
	src/src/edu/wayne/cs/raptor/EncounterService.java