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
calendar and date time picker added
Merge pull request #31 from seek-city/phil

calendar and date time picker added
working on pie-menu search event
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
updated show view for categories and moods
Merge pull request #33 from seek-city/phil

updated show view for categories and moods
Merge branch 'develop' of github.com:seek-city/seek-city into josh
moving date format const to base model.
Adding Carbon Alias for easy use.
Revert "Adding Carbon Alias for easy use."

This reverts commit 3a3efdd3e169e748509ebae46e6bafe542052010.
Adding Carbon Alias for easy access.
Changes:
- Fixing category and mood options for select inputs.
- Sending unauthenticated users to activities index if they try to access create view.
- Only allowing authenticated user and the user who created the activity to view edit form.
- On update action: check if an user is changing the image, delete old image.
- On destroy action: delete image.
- Fixed activity date input and handling for saving an activity.
- Associated a saved activity with the user.
Removing Calendar files in preparation for google calendar api.
Removing old/unneeded activity_user migration