using ActiveModelSerializers
Merge branch 'serializers'