Revert "welcome, Google"

This reverts commit bf183f1ed1f6a71322b34efb6585bf4a6b4583ba.
Merge branch 'master' into testing

Conflicts:
	app/robots.txt
Added dependencies
Misc changes for test environment
Merge branch 'master' into testing
Added different robots.txt files
Merge branch 'master' into testing

Conflicts:
	app/robots.prod.txt
Added symlink
Merge branch 'master' into testing
Merge branch 'master' into testing
Merge branch 'master' into testing

Conflicts:
	lib/config/env/test.js
Merge branch 'master' into testing
Merge branch 'master' into testing
Merge branch 'master' into testing
Changed user and added categories
Merge branch 'master' into testing
Fixed a bug on scrolling, when user had searched
Sitemap.xml is now per catalog
Merge branch 'master' into testing

Conflicts:
	lib/controllers/xml.js
Merge branch 'master' into testing