"updated homepage and minor update to login page"
merge fix.
Merge branch 'develop' of github.com:seek-city/seek-city into josh
Merge branch 'josh' of github.com:seek-city/seek-city into develop
Merge branch 'josh' into develop
merge fix.
Merge branch 'ruth-map' of github.com:seek-city/seek-city into develop

Conflicts:
	app/views/index.blade.php
	public/js/map-test.js
Merge pull request #31 from seek-city/phil

calendar and date time picker added