Merge pull request #6245 from neilLasrado/develop

Forms redesign for Schools Module.