new file:   slashquery/slashquery/config.php
	new file:   slashquery/slashquery/sites.php
Merge branch 'master' of github.com:nbari/slashquery

Conflicts:
	slashquery/slashquery/sites.php

	modified:   ../../help/nginx-virtualhost-no-pages-cache.conf
	modified:   ../../help/nginx-virtualhost-with-upload_module.conf
	modified:   ../../help/nginx-virtualhost.conf