Part 1 - ShepherdProperties migration in .java files
Migrating to ShepherdProperties
removing unnecessary files
start context coding
Adding new context files
More context coding

Resume next round with org.ecocean.servlet.KeywordHandler, moving in reverse alphabetic order
Even more context coding
moving on to fixing JSP files
more context fixes
more context...now building and running...
setting context to be based on 1) URL and then 2) cookie
working context changes!!!!!
Support MarkedIndividual.dataFiles as NULL
support for null MarkedIndividual.interestedResearchers
Fixing some navigation entries
Merge remote-tracking branch 'refs/remotes/origin/master' into contextcloud

Conflicts:
	src/main/java/org/ecocean/servlet/ServletUtilities.java
more context fixes from last nigth - interim commit - NOT WORKING
more context security changes
context security set/get
Context security working well!!!!!!!! Now need UI switching.