Merge branch 'master' into 2.0-development

Conflicts:
	ReactiveCocoaFramework/ReactiveCocoa.xcodeproj/project.pbxproj
	ReactiveCocoaFramework/ReactiveCocoa/NSObject+RACKVOWrapper.m
	ReactiveCocoaFramework/ReactiveCocoa/ReactiveCocoa.h
	ReactiveCocoaFramework/ReactiveCocoaTests/RACSignalSpec.m