Modify search and filter mechanism
Merge branch 'master' into login_tests

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'master' into login_tests

Conflicts:
	app/views/categories/index.html.erb
	app/views/categories/index.json.jbuilder
	app/views/home/_categories_pane.html.erb
	app/views/layouts/application.html.erb
	config/routes.rb
Merge pull request #24 from Empters/login_tests

Login tests