Partly added r5082 & r5200 from /tags/modified-shop-1.06 to trunk (/admin/coupon_admin.php still needs to be updated in trunk!)