add query to pagination link
add query to pagination link
Merge branch 'master' of heroku.com:edu-active

Conflicts:
	templates/web/search.html