added loginOrRegister twig file
Merge branch 'chartinger' into gsitter
Added a token generator
Merge remote-tracking branch 'origin/gsitter' into chartinger