Revert "Fixing config issues and adding locationID2 support"

This reverts commit 550d86f39953d4cf2851a79a8b5f5d291ea36e33.
Fix for encounter commenting
kicking off 3.4 developmental
Removing the ability for a user to delete their own account.
Adding ID display for sharkGrid
Adding the ability to reload commonConfiguration.properties without system reset
Prepping for 3.3.1 release
removing legacy web.xml security constraints
Further security refinements for 3.3.1
Adoption fixes
Adding email link to the Encounter page
Adding map-based selection to the Encounter page
fixing EncounterSetGPS security
Merge branch '3.x' into whaleshark.org

Conflicts:
	.classpath
	src/main/resources/bundles/commonConfiguration.properties
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/appadmin/admin.jsp
	src/main/webapp/software/GridClient.zip
	src/main/webapp/software/Interconnect.zip
Fixing regression tests
adding the ResetCommonCOnfiguration menu option back