Merge remote-tracking branch 'restkit/master' into update-0.23.3

Conflicts:
	.gitmodules
	Code/CoreData/RKManagedObjectStore.m