Corrected pagination
Corrected pagination bug by merging into one method
modified:   app/controllers/activities_controller.rb
modified:   app/helpers/query_helper.rb
modified:   app/views/activities/results.html.erb
modified:   config/routes.rb
Merge branch 'master' of https://github.com/thomasstephane/SYNthesis

Conflicts:
	app/views/activities/results.html.erb
Merge branch 'pagination'

Conflicts:
	app/views/activities/results.html.erb