Back-ported iOS7 fixes from https://github.com/Tony091250147/COPeoplePic...

...kerViewController