Merge change Ib1f7c3cb into eclair-mr2

* changes:
  Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.