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

Conflicts:
	app/views/index.blade.php
Merge remote-tracking branch 'origin/ruth-map' into develop

Conflicts:
	app/views/index.blade.php
Merge branch 'develop' of github.com:seek-city/seek-city into josh