updated bundle
styleguide
REFACTORING: started to merge article template model with article model to make things easier
weiter mit refactoring der controller ohne inherited resources
finished controller refactoring, tests still need some attention
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
style
fixed almost all failing tests, still 11 to go...
fixes tests
fixed a few tests and template stuff
merged with develop
schema update
added missing policy for CategoryCOntroller::select_category
fixed article template amoeba
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
fixed specs
fixed some last issues with templates
code coverage
category facets complete
upgraded gems and stuff