Fix conflicting method name
Start refactoring export specs
Cleanup
Start refactoring article export
some basic sales stats
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Refactoring
merged release-lizzie into develop
Merge branch 'release-lizzie' into develop
Fix export and add possibility to export bought and sold articles
Merge branch 'feature-import' of github.com:fairnopoly/fairnopoly into release-lizzie
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into develop
Update mass-upload documentation
Merge branch 'feature-import' of github.com:fairnopoly/fairnopoly into release-lizzie
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into develop
quickfix for #561, and some statistic additions
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into release-lizzie
Merge branch 'release-lizzie' into develop
Fix security issues - closes #498
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into release-lizzie