profiles
Merge branch 'master' of https://github.com/globant/salesforce-training

Conflicts:
	src/package.xml
	src/profiles/Chatter Only User.profile
	src/profiles/Content Only User.profile
	src/profiles/ContractManager.profile
	src/profiles/Force%2Ecom - App Subscription User.profile
	src/profiles/Knowledge Only User.profile
	src/profiles/MarketingProfile.profile
	src/profiles/ReadOnly.profile
	src/profiles/Siteforce Only User.profile
	src/profiles/SolutionManager.profile
	src/profiles/Standard.profile
	src/profiles/StandardAul.profile
Merge branch 'master' of https://github.com/globant/salesforce-training
new tabs, layouts and app