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

Conflicts:
	app/controllers/EventsController.php
Merge branch 'develop' of github.com:seek-city/seek-city into ruth
Merge pull request #9 from seek-city/josh

forgot this dude
Merge branch 'develop' of github.com:seek-city/seek-city into ruth

Conflicts:
	app/routes.php
removed semi-colon from activity
Merge pull request #10 from seek-city/phil

removed semi-colon from activity
added DATE_FORMANT const
commenting out 'by ->user->email' til users table is added and events are associated with users. also changed some  to .
Merge pull request #11 from seek-city/josh-fix-activities-index-view

Josh fix activities index view
Merge branch 'develop' of github.com:seek-city/seek-city into ruth
updated post to activities
removed erroneous variables
Merge pull request #12 from seek-city/ruth

Ruth
"modified to assign an id to post"
"commented out validator resolver"
"commented out activity date and price since that is not available yet"
Merge pull request #13 from seek-city/ruth

YEAH WORKS
fixed filename typo.