Add back in JSONKit.m since there is no longer a conflict with RestKit.
Merge branch 'master' into zerista