Merge LoginService
Merge branch 'master' of github.com:darthsuicune/Webservices