Merging back from 'master' to unstable
Merge pull request #633 from bhariharan/unstable

Merging back from 'master' to unstable
Bump up Javadoc version number
Merge pull request #634 from bhariharan/unstable

Bump up Javadoc version number
Fixing test
Merge pull request #636 from bhariharan/unstable

Fixing test
Merge branch 'master' into unstable
Merge pull request #639 from bhariharan/unstable

Merge 'master' into unstable
Merge branch 'master' into unstable
Merge pull request #641 from bhariharan/unstable

Merge branch 'master' into unstable
Merge branch 'master' into unstable
Merge pull request #643 from bhariharan/unstable

Merge branch 'master' into unstable
Adding back SmartSync references
Adding back SmartSync and SmartSyncTest source files
Merge pull request #644 from bhariharan/unstable

Adding back the SmartSync library and test project
Latest shared repo commit
Merge pull request #645 from bhariharan/master

Latest shared repo commit
Latest shared repo commit
Merge pull request #646 from bhariharan/unstable

Latest shared repo commit
Fix for deadlocks