Resolved merge conflict (I hope!)
Resolved merge conflict (I hope!)

NanoHttpd/nanohttpd,andreivisan/nanohttpd,huanyi0723/nanohttpd,NanoHttpd/nanohttpd,ouya/nanohttpd,CloudCom/nanohttpd,McFoggy/nanohttpd,DavikChen/nanohttpd,Omegaphora/external_nanohttpd,dmitrykolesnikovich/nanohttpd,Omegaphora/external_nanohttpd,weathersboyle/nanohttpd,geekboxzone/mmallow_external_nanohttpd,geekboxzone/mmallow_external_nanohttpd,codebeautiful/nanohttpd,harshjv/nanohttpd,guardianproject/nanohttpd,QumuloMe/nanohttpd,eighthave/nanohttpd,android-ia/platform_external_nanohttpd,McFoggy/nanohttpd,MIPS/external-nanohttpd,geekboxzone/lollipop_external_nanohttpd,gushedaoren/nanohttpd,weathersboyle/nanohttpd,ma5069073/nanohttpd,kayhanakbay/nanohttpd,ouya/nanohttpd,dmitrykolesnikovich/nanohttpd,MIPS/external-nanohttpd,CyanogenMod/android_external_nanohttpd,songfj/nanohttpd,eGxC/nanohttpd,CloudCom/nanohttpd,eGxC/nanohttpd,anandsadu/nanohttpd,songfj/nanohttpd,peterdocter/nanohttpd,WilliamDo/nanohttpd,harshjv/nanohttpd,DavikChen/nanohttpd,kayhanakbay/nanohttpd,LordFokas/nanohttpd,vnnv/nanohttpd_vnnv,updowndown/nanohttpd,guardianproject/nanohttpd,gushedaoren/nanohttpd,andreivisan/nanohttpd,panxw/nanohttpd,biswajitind/SCMF,Eljah/nanohttpd,codebeautiful/nanohttpd,vnnv/nanohttpd_vnnv,android-ia/platform_external_nanohttpd,EricCen/nanohttpd,QumuloMe/nanohttpd,anandsadu/nanohttpd,huanyi0723/nanohttpd,WilliamDo/nanohttpd,LordFokas/nanohttpd,Eljah/nanohttpd,ma5069073/nanohttpd,peterdocter/nanohttpd,geekboxzone/lollipop_external_nanohttpd,eighthave/nanohttpd,EricCen/nanohttpd,updowndown/nanohttpd,biswajitind/SCMF,panxw/nanohttpd