Merge change Iabe9529e into eclair

* changes:
  Adding ContactManager sample to SDK samples.