GCP-8461, GCP-8462
Merge branch 'master' of https://github.com/digitalabs/Fieldbook

Conflicts:
	src/main/resources/appconstants.properties
	src/main/webapp/WEB-INF/pages/NurseryManager/ver2.0/chooseSettings.html
	src/main/webapp/WEB-INF/static/js/nurseryManager.js