modified:   slashquery/index.php
Merge branch 'appengine' of github.com:nbari/slashquery into appengine

Conflicts:
	slashquery/index.php