Fixing git url in conf/setup.sh
Merge remote-tracking branch 'origin/master'