Merge branch 'develop'
solidary_qty fix
OfferItemCalculator refactoring
Merge branch 'master' into sprint3
cleanup