Merge branch 'master' into develop
Changed person model, added addpersonserializer, edited peopleserializer
Merge branch 'back' into develop
Added to pet model, Addpet serializer and view
Merge branch 'back' into develop
Added count to pets
Merge branch 'back' into develop
Merge branch 'develop'