categories .... almost done, dont try ise it
Merge remote-tracking branch 'origin/master' into categories
categories
Fix tests.
Merge pull request #50 from b17/testing

Fix tests.
SearchLayer moved into models.
Search layer in models.
Merge branch 'master' into search_layer

Conflicts:
	app/controllers/root_controller.rb
	config/routes.rb
Category filter for announces.