[TIMOB-12033] Fixed iOS cert parsing to properly decode special characters as well as organize certs by keychain.
[TIMOB-12033] Updated conflicts in the changelog.
Merge pull request #19 from appcelerator/timob-12033

[TIMOB-12033] Fixed iOS cert parsing to properly decode special characte...