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 branch 'develop' of github.com:seek-city/seek-city into ruth

Conflicts:
	app/routes.php
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