Apple and Samsung reportedly hug it out, will be partners once again from 2015 on

Citing industry sources, the deal was signed yesterday, July 14, and the decision was prompted by Samsung's earlier arrival at the next frontier – 14nm FinFET chips that will, reportedly, power whatever the iPhone 7 turns out to be. Keeping the salt at an immediate distance, we can definitely see Apple and Samsung putting aside their differences (to put it lightly) for a mutual benefit.
We'll keep a watchful eye and keep you updated should more information leak out.
source: The Korea Economic Daily