Changes to product admin and product front end
Merge origin/master