Some little fixes and working alpha of SamMarketplaceCategory Module