sonstiges -> weitere
enable category edit for admins
add cancellation form to welcome emails
fix #839 (hopefully)
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
fixed specs
code coverage
upgraded gems and stuff
fixed code coverage
resolved merge conflict
merged with develop
fixed code coverage and a brakeman issue
Merge branch 'feature-kick-inherited' of github.com:fairnopoly/fairnopoly into feature-kick-inherited
Merge branch 'feature-kick-inherited' into feature-facet-search
little fix and merge