Merge remote-tracking branch 'upstream/master'
fbsync: Temporarily removed the missleading option to import the contacts
Merge pull request #162 from annando/master

fbsync: Removed misleading option to add the contacts