Minor coding style improvements
Implements deleteService() method in order base item and unit tests
Removes payment/delivery services if they are not available any more
Skips next checkout steps after changing the basket content if they are not necessary
Merge pull request #618 from nsendetzky/master

Skips next checkout steps after changing the basket content if they are not necessary