Refactored code so we always have a proxy which is capable of logging requests and responses
Merge remote-tracking branch 'origin/develop' into develop