Added FriendlyId URls for Products
merge conflicts
friendly url merge