Load
Merge branch 'master' of github.com:BkupOrg2/DevboxCR1

Conflicts:
	layouts/Account-Account %28Marketing%29 Layout.layout
	layouts/Account-Account %28Sales%29 Layout.layout
	layouts/Account-Account %28Support%29 Layout.layout
	layouts/Account-Account Layout.layout
	layouts/Case-Case %28Marketing%29 Layout.layout
	layouts/Case-Case %28Sales%29 Layout.layout
	layouts/Case-Case %28Support%29 Layout.layout
	layouts/Case-Case Layout.layout
	layouts/Contact-Contact %28Marketing%29 Layout.layout
	layouts/Contact-Contact %28Sales%29 Layout.layout
	layouts/Contact-Contact %28Support%29 Layout.layout
	layouts/Contact-Contact Layout.layout
	objects/Account.object
	objects/Contact.object
	profiles/Admin.profile
	profiles/Chatter External User.profile
	profiles/Chatter Free User.profile
	profiles/Chatter Moderator User.profile
	profiles/ContractManager.profile
	profiles/Cross Org Data Proxy User.profile
	profiles/Custom%3A Marketing Profile.profile
	profiles/Custom%3A Sales Profile.profile
	profiles/Custom%3A Support Profile.profile
	profiles/Customer Community Login User.profile
	profiles/Customer Community User.profile
	profiles/Customer Portal Manager Custom.profile
	profiles/Customer Portal Manager Standard.profile
	profiles/Force%2Ecom - App Subscription User.profile
	profiles/Force%2Ecom - Free User.profile
	profiles/Gold Partner User.profile
	profiles/HighVolumePortal.profile
	profiles/Identity User.profile
	profiles/MarketingProfile.profile
	profiles/Partner App Subscription User.profile
	profiles/Partner Community Login User.profile
	profiles/Partner Community User.profile
	profiles/PlatformPortal.profile
	profiles/ReadOnly.profile
	profiles/Silver Partner User.profile
	profiles/SolutionManager.profile
	profiles/Standard.profile
	profiles/StandardAul.profile
	profiles/Work%2Ecom Only User.profile

Yep