Adding locationID as a submittable data field
fixing display
support null location in encounter.jsp
fixing getDate
Allowing better null handling in thmb nail generation
getting genetic sex from a Marked Individual
support null alternate ID in Encounter
fix more year calculation fields
minor fixes for date calculations
fixing maxTimeBetween sightings to liit itself to log dates >0
getting genetic sex from a Marked Individual
Allowing better null handling in thmb nail generation
minor tweks to support null Encounters
more tweakin
export Excel species fix
second part export species fix
set/get patterning code for encounter
adding showPatterningCodeProprty
finishing patterning code search functions
minor terminology and display tweaks
critical sex Encounter and MarkedIndividual searching fixes
calculate and display number of users
Merge branch 'origin/master'

Conflicts:
	src/main/resources/bundles/commonConfiguration.properties