Merge pull request #258 from DonnaWuDongxia/next

[bug fix] TDIS-5974 - use another method to add calendarId
[bug fix] TDIS-6520 - access property of undefined in contact.clone