Merge pull request #139 from RonPasquarelli/master

refactor mock services to use global client_id