repair cocoapods
d
Merge branch 'feature/bird1204' into devlop

This reverts commit 2d209771f6f5b47de2797ca40a7d1facfd458131.