Merge branch 'staging' of https://github.com/beyond-z/beyondz-platform
Merge branch 'staging'
Merge branch 'master' of https://github.com/beyond-z/beyondz-platform
Made changes to text on several pages and the navigation bar, to reflect how BZ is addressing 7th grade students as well as college.
Merge branch 'text_revisions_for_7th_grade' of https://github.com/ehudtal/beyondz-platform into ehudtal-text_revisions_for_7th_grade

Conflicts:
	app/views/home/partner.html.erb
Merge branch 'ehudtal-text_revisions_for_7th_grade' into staging