Merge pull request #6318 from neilLasrado/develop

Rearranged fields in Student Applicant & Student, Split address field