removed proxy
Merge branch 'develop' of github.com:madcato/BenderButler into develop
Merge branch 'develop' of github.com:madcato/BenderButler into develop