Merge branch 'develop' into feature-rop
Fix Photo #93
Fix Knapsack #93
Fix reactOnPromotion #107 (1/2)
Merge branch 'feature-rop' into develop