fixed merge
fixed merge

callahanchris/pouchdb,colinskow/pouchdb,ntwcklng/pouchdb,Dashed/pouchdb,yaronyg/pouchdb,shimaore/pouchdb,shimaore/pouchdb,janl/pouchdb,elkingtonmcb/pouchdb,ntwcklng/pouchdb,mattbailey/pouchdb,TechnicalPursuit/pouchdb,cdaringe/pouchdb,slang800/pouchdb,cshum/pouchdb,mwksl/pouchdb,nicolasbrugneaux/pouchdb,spMatti/pouchdb,spMatti/pouchdb,HospitalRun/pouchdb,lakhansamani/pouchdb,garrensmith/pouchdb,lukevanhorn/pouchdb,Dashed/pouchdb,patrickgrey/pouchdb,nicolasbrugneaux/pouchdb,mattbailey/pouchdb,elkingtonmcb/pouchdb,slang800/pouchdb,pouchdb/pouchdb,microlv/pouchdb,p5150j/pouchdb,cesarmarinhorj/pouchdb,TechnicalPursuit/pouchdb,tohagan/pouchdb,nicolasbrugneaux/pouchdb,asmiller/pouchdb,slang800/pouchdb,cesarmarinhorj/pouchdb,bbenezech/pouchdb,mikeal/pouchdb,caolan/pouchdb,KlausTrainer/pouchdb,HospitalRun/pouchdb,daleharvey/pouchdb,KlausTrainer/pouchdb,h4ki/pouchdb,ramdhavepreetam/pouchdb,pouchdb/pouchdb,garrensmith/pouchdb,optikfluffel/pouchdb,Charlotteis/pouchdb,h4ki/pouchdb,nickcolley/pouchdb,bbenezech/pouchdb,HospitalRun/pouchdb,yaronyg/pouchdb,garrensmith/pouchdb,asmiller/pouchdb,crissdev/pouchdb,ntwcklng/pouchdb,johnofkorea/pouchdb,janraasch/pouchdb,janraasch/pouchdb,jhs/pouchdb,optikfluffel/pouchdb,crissdev/pouchdb,greyhwndz/pouchdb,mikeymckay/pouchdb,cshum/pouchdb,seigel/pouchdb,tohagan/pouchdb,cdaringe/pouchdb,cesarmarinhorj/pouchdb,Knowledge-OTP/pouchdb,tyler-johnson/pouchdb,colinskow/pouchdb,colinskow/pouchdb,Charlotteis/pouchdb,janl/pouchdb,adamvert/pouchdb,Knowledge-OTP/pouchdb,Actonate/pouchdb,p5150j/pouchdb,mainerror/pouchdb,mikeymckay/pouchdb,tyler-johnson/pouchdb,johnofkorea/pouchdb,slaskis/pouchdb,bbenezech/pouchdb,h4ki/pouchdb,callahanchris/pouchdb,microlv/pouchdb,yaronyg/pouchdb,mikeymckay/pouchdb,adamvert/pouchdb,adamvert/pouchdb,willholley/pouchdb,spMatti/pouchdb,ramdhavepreetam/pouchdb,ramdhavepreetam/pouchdb,cdaringe/pouchdb,johnofkorea/pouchdb,tyler-johnson/pouchdb,cshum/pouchdb,Actonate/pouchdb,seigel/pouchdb,daleharvey/pouchdb,tohagan/pouchdb,janraasch/pouchdb,patrickgrey/pouchdb,elkingtonmcb/pouchdb,jhs/pouchdb,nickcolley/pouchdb,daleharvey/pouchdb,optikfluffel/pouchdb,slaskis/pouchdb,Charlotteis/pouchdb,lakhansamani/pouchdb,shimaore/pouchdb,patrickgrey/pouchdb,p5150j/pouchdb,mainerror/pouchdb,Actonate/pouchdb,Knowledge-OTP/pouchdb,microlv/pouchdb,seigel/pouchdb,lukevanhorn/pouchdb,lukevanhorn/pouchdb,greyhwndz/pouchdb,mwksl/pouchdb,mainerror/pouchdb,mwksl/pouchdb,nickcolley/pouchdb,TechnicalPursuit/pouchdb,lakhansamani/pouchdb,jhs/pouchdb,KlausTrainer/pouchdb,callahanchris/pouchdb,willholley/pouchdb,asmiller/pouchdb,janl/pouchdb,marcusandre/pouchdb,mattbailey/pouchdb,willholley/pouchdb,Dashed/pouchdb,greyhwndz/pouchdb,slaskis/pouchdb,evidenceprime/pouchdb,crissdev/pouchdb,marcusandre/pouchdb,marcusandre/pouchdb,pouchdb/pouchdb