Fix merge conflicts
Fix merge conflicts
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into feature-import
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
fixes #660
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
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop