fix crash with role blockers in mafia
Merge pull request #934 from MJB47/mafia

fix crash with role blockers in mafia
fix 2 logic bugs in mafia
Merge pull request #939 from MJB47/mafia

fix 2 bugs in mafia
Merge remote-tracking branch 'upstream/master'