Merge pull request #61 from MediaSapiens/discount

Discount
Fix klarna
Merge branch 'wimoto_dev' of github.com:MediaSapiens/flamaster into 4719_klarna
Merge pull request #62 from MediaSapiens/4719_klarna

4719 klarna
Added validation to date format in discounts
fix
4660
Merge branch 'wimoto_dev' of github.com:MediaSapiens/flamaster into 4660
4660
4743_delete_discount
Merge branch 'wimoto_dev' of github.com:MediaSapiens/flamaster into 4743_delete_discount
Merge pull request #64 from MediaSapiens/4743_delete_discount

4743 delete discount
Merge pull request #63 from MediaSapiens/4660

4660
Hot fix
Merge branch 'wimoto_dev' of github.com:MediaSapiens/flamaster into wimoto_dev
Hot fix
Hot fix
Hot fix
Fix submodule
Fix #4738