working towards passport and token integration
Merge pull request #28 from louridas/master

working towards passport and token integration