removed proxy fixer
Merge branch 'develop'