Added some Login Handling...
OMerge branch 'master' of https://github.com/BlockServerProject/BlockServer