commit before merge
resolved conflicts, updated fixtures
created admin and adoptee user roles
refactored code for adding pet, serious bugs in Pet and App slider code