[TIMOB-12265] Fixed bugs in the analytics library when the user is offline.
Merge pull request #18 from appcelerator/timob-12265

[TIMOB-12265] Fixed bugs in the analytics library when the user is offline.
[TIMOB-12167] Fixed plist parsing when <string> tag is empty.
Merge pull request #20 from appcelerator/timob-12167

[TIMOB-12167] Fixed plist parsing when <string> tag is empty.
[TIMOB-12033] Updated conflicts in the changelog.