Add scopes in activity model

Fix activity controller to use scopes

Conflicts:
	app/controllers/api/v1/activities_controller.rb