Persistence and language fix
Merge branch 'CodeReviewRefactor'

Conflicts:
	grails-app/controllers/schoolsdata/BasicSchoolInformationController.groovy
	grails-app/views/basicSchoolInformation/index.gsp