complying with https://github.com/buddycloud/buddycloud-server-java/commit/ca3f0e925175aed6939d4004f1a25f9261a2c245
avoid defining http_proxy - python doesn't seem to handle it very well
Update build-docker.sh
Merge pull request #34 from buddycloud/develop

merging develop into master