Move robots.txt to web root
Merge branch 'master' into prod