Added Siteloc logic
Fixed errors from repo change
Merge remote-tracking branch 'Github_Remote/master'