School Registration Adjusments
other edits
Merge branch 'master' of https://github.com/OKTech/test

Conflicts:
	js/FrontPageValidation.js