Merge remote-tracking branch 'origin/master'

Conflicts:
	DS/PHP/handlekurv.php

	empty cart issue resolved
Merge remote-tracking branch 'origin/master'