Merge branch 'master', remote-tracking branch 'origin' into issue-102
Make proxy-server.conf completely customizable

closes #102
Merge pull request #109 from rpedde-rcbops/issue-102

Merged automatically by jenkins after successful build test