GCP-5844
Merge branch 'master' of https://github.com/digitalabs/Fieldbook

# By daniel@efficio.us.com (2) and chezka (1)
# Via daniel@efficio.us.com
* 'master' of https://github.com/digitalabs/Fieldbook:
  added test data for the test cases
  initial code development for GCP-5846
  GCP-5845

Conflicts:
	src/main/webapp/WEB-INF/pages/NurseryManager/nurseryDetails.html