Partly revoked r5676 & r5693 and added already defined smarty from r1546 from trunk to /tags/modified-shop-1.06