fixed login bug and removed enc e/i
Merge branch 'master' of https://github.com/aperauch/TMS-Twink
Merge branch 'master' of https://github.com/aperauch/TMS-Twink