Merge branch 'master' into feed

app/builders/learning_object_builder.rb

app/controllers/v1/search_controller.rb

app/controllers/v1/users_controller.rb

app/models/review.rb

app/policies/application_policy.rb

app/policies/collection_policy.rb

app/serializers/review_rating_serializer.rb

app/serializers/review_serializer.rb

app/serializers/user_serializer.rb

app/services/search_service/learning_object.rb

db/migrate/20160125120915_create_learning_objects.rb

lib/tasks/import/institutions.rake

lib/tasks/import/learning_objects.rake

lib/tasks/import/tags.rake

lib/tasks/score.rake