No more RestKit
Merge pull request #470 from bhariharan/master

No more RestKit
Merge branch 'master' into unstable
Merge pull request #471 from bhariharan/unstable

Merge branch 'master' into unstable