adding token to service to allow it to be used at constructor time by Object_* class
Merge branch 'feature-api' into feature-ssl