Merge branch 'master' into rspec_doc

app/controllers/v1/activities_controller.rb

app/controllers/v1/feed_controller.rb

app/controllers/v1/users_controller.rb

app/models/bookmark.rb

app/models/carousel.rb

app/models/collection.rb

app/models/collection_item.rb

app/models/complaint.rb

app/models/concerns/complainable.rb

app/models/concerns/followable.rb

app/models/concerns/highlights.rb

app/models/concerns/reputationable.rb

app/models/concerns/reviewable.rb

app/models/concerns/scoreable.rb

app/models/concerns/sociable.rb

app/models/concerns/stageable.rb

app/models/concerns/subjectable.rb

app/models/concerns/tagger.rb

app/models/concerns/thumbnailable.rb

app/models/concerns/trackable.rb