Added different robots.txt files
Fine-tuned robots.txt a bit
Merge branch 'master' into testing

Conflicts:
	app/robots.prod.txt