Changes for the way we handle the Json on iOS, and updates to both Android and iOS SDK