Loading events on user's page was not worked correctly. Fixed
Merge branch 'feature/notifications' into new_staging

* feature/notifications:
  Loading events on user's page was not worked correctly. Fixed

Conflicts:
	app/controllers/users_controller.rb