Fixing merge conflict
Fixing merge conflict

gsmeets/canjs,schmod/canjs,WearyMonkey/canjs,rjgotten/canjs,jebaird/canjs,Psykoral/canjs,whitecolor/canjs,dimaf/canjs,rasjani/canjs,sporto/canjs,rjgotten/canjs,tracer99/canjs,thomblake/canjs,rasjani/canjs,mindscratch/canjs,cohuman/canjs,bitovi/canjs,sporto/canjs,sporto/canjs,juristr/canjs,cohuman/canjs,scorphus/canjs,whitecolor/canjs,bitovi/canjs,beno/canjs,jebaird/canjs,UXsree/canjs,WearyMonkey/canjs,airhadoken/canjs,Psykoral/canjs,gsmeets/canjs,rasjani/canjs,whitecolor/canjs,juristr/canjs,shiftplanning/canjs,janza/canjs,ackl/canjs,dimaf/canjs,tracer99/canjs,yusufsafak/canjs,bitovi/canjs,thecountofzero/canjs,beno/canjs,janza/canjs,airhadoken/canjs,azazel75/canjs,UXsree/canjs,patrick-steele-idem/canjs,bitovi/canjs,asavoy/canjs,dispatchrabbi/canjs,azazel75/canjs,tracer99/canjs,scorphus/canjs,schmod/canjs,yusufsafak/canjs,thecountofzero/canjs,dispatchrabbi/canjs,WearyMonkey/canjs,rjgotten/canjs,schmod/canjs,ackl/canjs,beno/canjs,asavoy/canjs,Psykoral/canjs,ackl/canjs,cohuman/canjs,thomblake/canjs,rjgotten/canjs,patrick-steele-idem/canjs,mindscratch/canjs,gsmeets/canjs,Psykoral/canjs,shiftplanning/canjs,jebaird/canjs,rasjani/canjs,patrick-steele-idem/canjs