activities seeder fix
Merge branch 'develop' of github.com:seek-city/seek-city into phil

Conflicts:
	app/database/seeds/ActivitiesTableSeeder.php
merge prep
merge prep
Merge branch 'develop' of github.com:seek-city/seek-city into ruth-map

Conflicts:
	app/controllers/ActivitiesController.php
	app/database/seeds/ActivitiesTableSeeder.php
	app/database/seeds/DatabaseSeeder.php
	app/views/partials/navbar.blade.php
merge develop into Phil's branch
changed moods and venues as well as index's. Adding images for project.
no message
map fixes.
seeding user
google api- now pulling from venues
addresses added to activities and are now shareable
social media
Merge branch 'develop' of github.com:seek-city/seek-city into ruth-map

Conflicts:
	app/database/seeds/DatabaseSeeder.php
	app/views/activities/index.blade.php
Merge pull request #46 from seek-city/ruth-map

Ruth map
Fixing map issues for venues.
Merge branch 'develop' of github.com:seek-city/seek-city into josh

Conflicts:
	app/views/activities/index.blade.php
	app/views/venues/index.blade.php
pics and activity data for site.
activities seeding
Merge branch 'develop' of github.com:seek-city/seek-city into phil

Conflicts:
	app/views/venues/index.blade.php
Merge pull request #47 from seek-city/phil

Phil