Removing double EncounterSetVerbatimEvntDate mapping
Fix measurement-related JDOQL syntax error in Encounter Search
allowing for >= and <= on Encounter Search and Individual Search measurements and biomeasurements
Midway through and/OR operation for keywords in Individual Search
Complete and/or keyword searching in Individual Search
Merge branch '3.x' into whaleshark.org

Conflicts:
	src/main/webapp/WEB-INF/web.xml