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

Conflicts:
	src/main/java/com/efficio/fieldbook/web/nursery/controller/CreateNurseryController.java
	src/main/webapp/WEB-INF/pages/NurseryManager/chooseSettings.html
Merge branch 'master' of https://github.com/digitalabs/Fieldbook