CRITICAL FIX: stop nulling PMF
CRITICAL FIX: stop nulling PMF
Removing unnecessary printlns
handling null values better for getting other marked individuals in an occurrence
Removing unnecessary printlns
handling null values better for getting other marked individuals in an occurrence
CRITICAL connection management fixes for MySQL
CRITICAL connection management fixes for MySQL
fixing Find Record form to use absolute URL
fixing Find Record form to use absolute URL
better role display
CRITICAL: Fixing JQuery overlapping referneces
CRITICAL: Removing USER.currentContext
CRITICAL: Default page user check needs to be against context0
CRITICAL: Better null handling of PMFs and users
Merge branch 'origin/contextcloud'

Conflicts:
	src/main/java/org/ecocean/ShepherdPMF.java
Merge branch 'origin/master'

Conflicts:
	src/main/java/org/ecocean/ShepherdPMF.java
	src/main/webapp/index.jsp