Adding proxy service
Merge branch 'proxyService'
Merge remote-tracking branch 'origin/master'