add proxy
Merge remote-tracking branch 'origin/master'

Conflicts:
	setup.sh
do not use git-prompt on Windows as it is too slow