added state field to all swaps
Merge branch 'master' of https://github.com/timmNygren/barter_system_final