for #811 - scaffold for rack-rewrite redirects and category#show partials
for #811 - implement 2-5 grid
Merge branch 'feature-rack-rewrite' into feature-5-grid
search refactoring (unfinished) and addition to category#show
Merge branch 'develop' into feature-5-grid

Conflicts:
	app/controllers/articles_controller.rb
	app/views/articles/index.html.haml
	app/views/articles/shared/_articles_grid.html.haml
	app/views/categories/index.html.haml
merge fixes
saving latest changes
category#show improvements
Merge branch 'develop' into feature-5-grid

Conflicts:
	db/schema.rb
category dropdown for search
Merge branch 'develop' into feature-5-grid

Conflicts:
	Gemfile.lock
	app/objects/form/article_search_form.rb
for #811 - almost finished grid and dropdown. suite failing, needs css refactoring
fixed category sidebar
hi konstantin.... sorry dass wir dein search_value_model wieder gekillt haben. ABER ES HAT NICHT FUNKTIONIERTgit add app/views/categories/index.html.haml! Und jetzt sieht doch eigentlich alles so aus wie bei d. oder ??? greez paul & andi
drowdown filter prototyped
basic fix and rename for the general toggle js
test suite fixed. need coveralls for coverage.
fixed test coverage
dropdown prototype, some minor tweaks on header
Merge branch 'feature-5-grid' of github.com:fairnopoly/fairnopoly into feature-5-grid