changing proxy service proxy
Merge branch 'AddingMockedData'