Lionel Messi has signed a new deal to stay at Barcelona until 2021, with the Catalan giants inserting a 700 million Euro buyout clause into the terms.