Handle promotion usage counter
Add Contains Product promotion rule
Fix some CS issues caused by last merges
Add missing paypal express checkout config.
Fix user order addressing issue.
Merge pull request #2165 from Joypricecorp/bugfix/fix-1911-n-more

Fix user order addressing issue.
Merge pull request #2156 from stloyd/bugfix/cs

Fix some CS issues caused by last merges
Merge pull request #2159 from Joypricecorp/fixbug/missing-paypal-config

Add missing paypal express checkout config.
Merge pull request #2155 from winzou/contains_product

Add Contains Product promotion rule
Merge pull request #2154 from winzou/promotion_usage

Handle promotion usage counter