Fixing config issues and adding locationID2 support
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
user mgmt improvements with profile photo and new fields
More uer profile image interim commits
More support for user profile photos
Merge branch '3.x' into mantamatcher.org - 3.3.1 release merge plus some new code from 3.4 ongoing related to profile pictures for users

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