Merge pull request #1 from Sylius/master

Merge with current version
gitignore
Fixed discount promotion calcutaion
Revert "gitignore"

This reverts commit 46532fd7902bc74a831b17ae2f724650befac864.
Spec and test fix for percent discount
Add sylius_sales configuration override
Better way to handle sales_bundle detection
Fix typo
Merge pull request #366 from amenophis/cart_sales_config

Add sylius_sales configuration override
Add missing dependency
Merge pull request #367 from amenophis/sales_money

add missing required dependency
Fix Shipping Adjustment application

Currently ShippingChargesProcessor only adds shipping adjustments. This commit makes it remove already applied adjustments before applying new ones.
Also adds to the spec tests.
Merge pull request #370 from Richtermeister/fix-shipping-adjustments

Fix Shipping Adjustment application
Merge pull request #352 from antonioperic/fixing-promotion

Fixing promotion percent calculation