Values in plist that start with "<--" are ignored on setup
Merge branch '20131025-federated-cloud-contacts' into private-20140226-robin-settings-fix

# By Sergej Jovanovic
# Via Sergej Jovanovic
* 20131025-federated-cloud-contacts:
  Values in plist that start with "<--" are ignored on setup