Implements phase 2 landing page
Merge branch 'student-reg-redesign' of github.com:learning-unlimited/ESP-Website into student-reg-redesign

Conflicts:
	esp/public/media/scripts/catalog-new.js