API: Renamed CBLDatabaseChange.maybeConflict to .inConflict

Fixes #196
Fixed asyncTask count error in -[CBL_Pusher uploadMultipartRevision:]

Fixes #211