Updated Android side to support latest modifications. Updated Android JSON to support bug that affected the Desktop version.