过滤搜索功能
Merge branch 'master' of github.com:scige/crystal

Conflicts:
	config/routes.rb
修改routes