Handshake modified

Handshake modified so that it passes nfc and barcode values on handshake
ShuffleNFC M1

Added shuffle with NFC.