whoops! broke file upload for encounters with no files
fixing getKeyword (cherry-picking from commit 0599dbc9670f37837f53b7e9382d527c0dd04944)
more config to support new users
NEW - allow Encounter.locationID to be set from a pre-defined list in commonConfiguration.properties. If no list exists, default to an open-ended text field. (done)
adding correct email addresses for regions
updated role mapping
fixing a null option that pops up for location ID
typo and link fix
minor adoption fixes
more minor adoption fixes
granting more permissions to researchers
Merge remote branch 'origin/mantamatcher.org' into mantamatcher.org
merging -1 maxYears fix
rplacing shark references with manta
Starting requested CAPTURE export
CAPTURE export support
fixing cross-browser URL
releasing 2.1.0
2.2: upgrading derby to 10.8.2.2 to fix a SQL handling issue observed in GeneGIS
2.2: upgrading derby to 10.8.2.2 to fix a SQL handling issue observed in GeneGIS