shops, category, subcategory
Merge branch 'master' of https://github.com/globant/salesforce-training

Conflicts:
	src/profiles/Admin.profile
	src/profiles/Authenticated Website.profile
	src/profiles/Chatter External User.profile
	src/profiles/Chatter Free User.profile
	src/profiles/Chatter Moderator User.profile
	src/profiles/Chatter Only User.profile
	src/profiles/Content Only User.profile
	src/profiles/ContractManager.profile
	src/profiles/Customer Community Login User.profile
	src/profiles/Customer Community User.profile
	src/profiles/Customer Portal Manager Custom.profile
	src/profiles/Customer Portal Manager Standard.profile
	src/profiles/Force%2Ecom - App Subscription User.profile
	src/profiles/Guest License User.profile
	src/profiles/Guest.profile
	src/profiles/High Volume Customer Portal User.profile
	src/profiles/Knowledge Only User.profile
	src/profiles/MarketingProfile.profile
	src/profiles/Partner Community Login User.profile
	src/profiles/Partner Community User.profile
	src/profiles/ReadOnly.profile
	src/profiles/Siteforce Only User.profile
	src/profiles/SolutionManager.profile
	src/profiles/Standard.profile
	src/profiles/StandardAul.profile