Merging local staging to staging

Had to fix conflicts in make_mozilla/pages/fixtures/initial_data.json