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

Conflicts:
	src/main/java/com/efficio/fieldbook/web/nursery/controller/ManageNurserySettingsController.java
	src/main/webapp/WEB-INF/pages/NurseryManager/manageNurserySettings.html
	src/main/webapp/WEB-INF/static/js/nurseryManager.js