Update of smartpy contracts from my previous work to new syntax

tezos-contract-2.0