using the referer header to proxy
Merge branch 'beta'
Merge remote-tracking branch 'origin/master'