Merge branch 'master' into rspec_doc

app/models/download.rb

app/models/follow.rb

app/models/like.rb

app/models/rate.rb

app/models/review.rb

app/models/review_rating.rb

app/models/role.rb

app/models/score.rb

app/models/share.rb

app/models/tagging.rb

app/models/user.rb

app/models/user_category.rb

app/models/view.rb

app/serializers/public_activity/activity_serializer.rb

config/routes.rb

test/controllers/v1/collections_controller_test.rb

test/fixtures/collections.yml