merge the iphone-demo branch back into master, since it doesn't directly conflict with anything in master (as well as makes life way easier for me than constantly merging master-related shit into my own branch)
merge the iphone-demo branch back into master, since it doesn't directly conflict with anything in master (as well as makes life way easier for me than constantly merging master-related shit into my own branch)

voxmedia/quill,Asana/quill-1,jcppman/quill,eXcomm/quill,sferoze/quilljs,gutenye/quill,KentZheng/testingflow,KentZheng/testingflow,willrowe/quill,anovi/quill,DemocracyOS/quill,dahal/quill,fraywing/quill,KentZheng/gitFlowTIA,syungkeaw/quill,smartsocialmedia/quill,praneybehl/quill,KentZheng/gitFlowTIB,kmoe/quill,casetext/quill,kmoe/quill,sferoze/quilljs,mobitroll/kahoot-quill,Asana/quill-1,milqfm/quill,tim-mc/quill,mobitroll/kahoot-quill,quilljs/quill,JoshBarr/quill,KentZheng/gitFlowTIB,KentZheng/gitFlowTIA,voxmedia/quill,fraywing/quill,Benibur/quill,quilljs/quill,voxmedia/quill,sferoze/quilljs,willrowe/quill,sferoze/quilljs,smartsocialmedia/quill,milqfm/quill,DemocracyOS/quill,studio666/quill,tim-mc/quill,jziggas/quill,casetext/quill,quilljs/quill,jayzawrotny/quill,hampsterx/quill,psiemens/quill,willrowe/quill,psiemens/quill