Fix merge conflicts
Fix merge conflicts
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into feature-import
started refactoring of rating stuff
some refacturing of ninas tests, refactured state machines and some methods
weiteres refactoring
added max_value_of_goods_cents_bonus to rails admin
Rating refactoring finished 90%
Merge branch 'feature-import' of github.com:fairnopoly/fairnopoly into feature-import
Fix merge conflicts
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into feature-import
Fix empty screen when reimporting unchanged exports
Add links to update articles via csv in legal entity profile
Fix checkboxes bug caused by white spaces
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Remove test for old version
Merge branch 'feature-import' of github.com:fairnopoly/fairnopoly into develop
Fix wording
Update mass-upload documentation
fixes #648