removing old ios-client on swift branch
sync with latest ios-client from master