pulling a up to date commit

Login, service class, bugs