BAZYNGO-736 moderation
Merge branch 'dev' of git@github.com:objectledge/ledge.git into dev