Merge remote-tracking branch 'upstream/master'

Conflicts:
	GitX.xcodeproj/xcshareddata/xcschemes/GitX.xcscheme
	MGScopeBar
	Sparkle
	objective-git