Merge conflicts resolved.

Preparing for full merge on Kuben/master
Merge branch Customitems

Branch successfully merged into master.
Bugfixes

[BUGFIX] Paying more items will give you the last price processed instead of the sum of all the prices.
[BUGFIX] Sales are working now, you can give separate sales for separates data values. Now sales apply for all prices set for a specific item.