Setting 4.0.3 release version
4.1.0 development start
individualSearchResults.jsp performance optimization - signficiant
Merge branch 'origin/whaleshark.org'
Merge commit '465570795d7a6670b63763eb92dcbd487e6b93d6'

Conflicts:
	src/main/resources/bundles/confirmSubmitEmails.properties
setting version to 4.0.4
adding discovery curves
adding Encounter Search seasonality
part 1: user acceptance agreement requirement
part 2: accept user agreement
part 3: reset all users for new user agreement
User Agreement Part 4: turn on and off form in content
FIX: prevent user images from displaying ind efault thumbnail search
FIX Part 2: Don't show User Profile Images in Thumbnail Image display
Username searching fix
improved alternateID searching
fixing data display tags
Auto-populating some fields based on logged in user
Added social media metadata for selecting correct image when sharing on Facebook
limiting key length for GeneticAnalysis for MySQL database