Search functionally with working tests
Merge branch 'searchTool' into dev

Conflicts:
	app/controllers/contests_controller.rb