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