Scheme tweak
Updates CocoaHTTPServer
Merge branch 'master' of github.com:mz2/couchbase-lite-ios