Fixing issue with proxy
Merge branch 'master' of github.com:evrythng/wot-a-mashup