My improved backup
Merge branch 'master' of https://github.com/banderson5144/sf_backup

Conflicts:
	objects/Activity.object
	package.xml
	profiles/Admin.profile
	profiles/Chatter External User.profile
	profiles/Chatter Free User.profile
	profiles/Chatter Moderator User.profile
	profiles/ContractManager.profile
	profiles/Custom%3A Marketing Profile.profile
	profiles/Custom%3A Sales Profile.profile
	profiles/Custom%3A Support Profile.profile
	profiles/Customer Portal Manager Custom.profile
	profiles/Customer Portal Manager Standard.profile
	profiles/Force%2Ecom - Free User.profile
	profiles/Gold Partner User.profile
	profiles/HighVolumePortal.profile
	profiles/MarketingProfile.profile
	profiles/PlatformPortal.profile
	profiles/ReadOnly.profile
	profiles/Silver Partner User.profile
	profiles/SolutionManager.profile
	profiles/Standard.profile
	profiles/StandardAul.profile