-upload and removal of processed image working (reverse-merged from commit baaec0cc3a219255fbf779be6b31da9f92943b5d)
fixing this for 2.4 upgrade
restoring mantamatcher algorithm after merge
Merge branch '3.x' into mantamatcher.org
adding for mantamatcher.org
Merge branch '2.x' into mantamatcher.org

Conflicts:
	pom.xml
	src/main/java/org/ecocean/CommonConfiguration.java
	src/main/java/org/ecocean/Shepherd.java
	src/main/java/org/ecocean/servlet/ServletUtilities.java
	src/main/resources/bundles/commonConfiguration.properties
	src/main/resources/bundles/en/encounter.properties
	src/main/resources/bundles/haplotypeColorCodes.properties
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/encounters/encounterAdoptionEmbed.jsp
	src/main/webapp/footer.jsp
	src/main/webapp/individualAdoptionEmbed.jsp (reverse-merged from commit 6dc2c8252f23c8819df5f2056adbeeb13f871409)
Minor comment change to allow compilation under Java 7 (UTF-8 compatibility issue).
Reduced compiler warnings: changed a POM property, & removed duplicate dependency.
fixing masthead...
Merge branch '3.x' into mantamatcher.org

Conflicts:
	src/main/resources/bundles/commonConfiguration.properties
	src/main/webapp/header.jsp
more configuration
Fixed erroneous submissions email address.
Initial version of Batch Upload feature.
Method name change to be more accurate, and comment correction.
Minor bug fixes, including prevent trying to generate thumbnail images for video files.
Removed erroneous unavailable parse field from properties file.
Clarified spreadsheet support for CSV files on batch upoad page.
Added missing properties file for batch upload.
Merge branch '3.x' into mantamatcher.org
Clarified batch upload description: inability to modify existing data.