Temporarily switch to my fork of CocoaHTTPServer for OPTIONS support.
Bump CocoaHTTPServer.
Merge branch 'master' of https://github.com/ReactiveCocoa/RockemSockem into CORS-conformance
Bump CocoaHTTPServer to include OPTIONS support.
Switch back to joshaber’s fork of CocoaHTTPServer.
Merge pull request #5 from ReactiveCocoa/CORS-conformance

CORS conformance
++RAC to fix RACCommand KVO crashes
Merge remote-tracking branch 'origin/master' into rac-3.0

Conflicts:
	External/ReactiveCocoa