Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec

app/controllers/v1/activities_controller.rb

app/controllers/v1/feed_controller.rb

app/controllers/v1/users_controller.rb

app/models/bookmark.rb

app/models/collection_item.rb

app/models/complaint.rb

app/models/concerns/trackable.rb

app/models/download.rb

app/models/follow.rb

app/models/like.rb

app/models/rate.rb

app/models/review.rb

app/models/share.rb

app/models/tagging.rb

app/models/user.rb

app/models/view.rb

app/serializers/public_activity/activity_serializer.rb

config/routes.rb