Merge branch 'master' into WATERSMART-347

Conflicts:
	nwc/src/main/webapp/client/nwc/workflows/aquaticBiology/aquaticBiologyMap.js