Lionel Messi has signed a two-year contract extension with Barcelona, linking him to the Spanish club until June 2018. (Reuters)