going back to old jquery.
commit packages. removing old calendar package.
adding withInput to activities index route.
Merge branch 'develop' of github.com:seek-city/seek-city into josh-pie-menu-json
Merge branch 'develop' of github.com:seek-city/seek-city into josh-pie-menu-json
trying to chain queries
Merge pull request #39 from seek-city/phil

Phil
merge fix
Merge branch 'develop' of github.com:seek-city/seek-city into ruth-map

Conflicts:
	app/database/seeds/ActivitiesTableSeeder.php
	composer.json
Merge pull request #40 from seek-city/ruth-map

Ruth map
Merge branch 'develop' of github.com:seek-city/seek-city into josh-pie-menu-json

Conflicts:
	app/database/seeds/ActivitiesTableSeeder.php
	app/views/activities/index.blade.php
	composer.json
Merge pull request #41 from seek-city/josh-pie-menu-json

Josh pie menu json
Fixes to activities/venues relationships
Merge pull request #42 from seek-city/josh-pie-menu-json

Fixes to activities/venues relationships
Merge branch 'develop' of github.com:seek-city/seek-city into phil

Conflicts:
	app/database/seeds/ActivitiesTableSeeder.php