Validate cashback selections
Proper primary key on efsnetTokens
Merge remote-tracking branch 'upstream/master'