fix the error msg
Merge branch 'master' of https://github.com/digitalabs/Fieldbook

Conflicts:
	src/main/resources/Messages.properties
	src/main/resources/Messages_en.properties
	src/main/webapp/WEB-INF/pages/NurseryManager/chooseSettings.html