Added fixes to Token Handling#8

Open

NickolausDS wants to merge 3 commits intofair-research:masterfrom

NickolausDS:introspection-fixes

Commits on May 22, 2018

Added fixes to Token Handling
NickolausDS
committed

Commits on Jun 1, 2018

Changed variable names to be more sensical.
NickolausDS
committed

Commits on Jun 5, 2018

Check against email instead of username
NickolausDS
committed