Landing Page Updates
Merge branch 'jon' into sprint5

Conflicts:
	templates/01uberheader.html