- stupid xcode removed file which was not removed
Merge branch '20131025-federated-cloud-contacts'

* 20131025-federated-cloud-contacts:
  - stupid xcode removed file which was not removed