Merge pull request #207 from nsendetzky/master

Separates delivery and payment service fees in single positions in the basket
Switches position of payment and delivery to match default order in checkout process
Links delivery/payment service costs in summaries of basket and checkout