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
Merge pull request #352 from antonioperic/fixing-promotion

Fixing promotion percent calculation