fixed category and product
Merge branch 'master' of https://github.com/Akravish/magento_p