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

Conflicts:
	src/main/java/com/efficio/fieldbook/web/nursery/controller/ManageNurserySettingsController.java