Refactored EslClient and AuthentificationTokensService
Merge branch 'master' into dev