Lionel Messi has agreed a new two-year deal at Barcelona after months of speculation linking him with a move away from the club