Added disallow back in to robots.txt
Merge branch 'robots_fix'

Conflicts:
	src/main/resources/files/robots.txt