fixed: productlist price regexp + small code cleanup
Merge branch 'develop' into feature/coupons