Kissing and making up. Well, to a point. But I have seen the future and, my dear readers, it is so very bright! Apple and Samsung have announced that they…