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
Adding Google Client info
Adding Google Calendar Alias, fixing whitespace.
Adding Google Login action, tweaking Facebook Login action.
Moving Auth::check to constructor.
Adding likable trait to models.
Moved side profile to partial.
Adding likability to activity show.
Cleaning up master.
Moving jquery to header.
Adding a map to the venue form.
Adding OAuth logins back to login page.
Adding google login route.
Styling google login link.
Adding google api client.
Cleaning up and commenting.
whitespace.
Merge branch 'develop' of github.com:seek-city/seek-city into josh