fix conform path for #import
Fixed equality test for query rows whose value is 'doc'

Regression from the emit-doc optimization (03454e8)
Merge pull request #389 from ManuTroquet/master

fix conform path for #import
Added a unit test for emitting nil values. Fixed some Xcode 6 compile issues.
Workaround to keep CBLJSONReader from being dealloced prematurely

I think this will fix #369.
Avoid unnecessary JSON data-to-string conversions during view indexing
Fixed mistake in JSON string collation Unicode ordering

Character comparison was using ASCII order instead of the real Unicode
collation order. (For example, '_' and '~' were sorting after letters
instead of before.)

This commit also bumps the db version number; the next time a database
is opened its view indexes will be cleared, so they'll be re-indexed
with the new ordering instead of getting an inconsistent mixture of the
old and new orderings.
Fixed FMDB submodule commit reference.
Merge branch 'master' of https://github.com/couchbase/couchbase-lite-ios
Fixed a case where a view query could use -1 instead of the view_id in the SQL query

https://groups.google.com/d/msgid/mobile-couchbase/aa81a906-188f-445f-b67c-3898503e3683%40googlegroups.com
Merge branch 'master' of https://github.com/couchbase/couchbase-lite-ios
Updated scheme