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 photo column so that they wrap at the right point or change to another div from a background into an image tag based on Bootstrap breakpoints.
Merge pull request #164 from bgrayless/fix_responsive_picture_column_margins

Fix responsive picture column margins
Fixed column image margins issue and scaling. Still need to replace images.
Add new properly sized images.
Merge pull request #165 from bgrayless/fix_image_side_margins

Fix image side margins
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 'staging' of https://github.com/beyond-z/beyondz-platform into fix_home_student_image
Merge branch 'staging' of https://github.com/beyond-z/beyondz-platform
fixed background position for an image on the home page, so it focuses on the right person when shown as a narrow column
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
Merge pull request #167 from ehudtal/fix_home_student_image

Fix home student image
Merge branch 'staging' of https://github.com/beyond-z/beyondz-platform
changed volunteer image on home pg, changed layout of partners pg, changed h1 and h2 sizes on small screens
a couple more minor changes
enrollments minimal
remove fake thing