Merge pull request #643 from bhariharan/unstable

Merge branch 'master' into unstable
Adding back SmartSync references
Adding back SmartSync and SmartSyncTest source files