updated product, catergories, added cart index page
pull from origin master