* [html5] fix conflicts
* [html5] fix conflicts

dianwodaMobile/DWeex,weexteam/incubator-weex,misakuo/incubator-weex,dianwodaMobile/DWeex,MrRaindrop/incubator-weex,alibaba/weex,Hanks10100/incubator-weex,weexteam/incubator-weex,dianwodaMobile/DWeex,MrRaindrop/weex,boboning/weex,namedlock/weex,acton393/weex,zhangquan/weex,zhangquan/weex,LeeJay0226/weex,cxfeng1/incubator-weex,xiayun200825/weex,leoward/incubator-weex,MrRaindrop/incubator-weex,boboning/weex,erha19/incubator-weex,miomin/incubator-weex,HomHomLin/weex,yuguitao/incubator-weex,boboning/weex,Hanks10100/weex,HomHomLin/weex,misakuo/incubator-weex,Neeeo/incubator-weex,leoward/incubator-weex,bigconvience/weex,Hanks10100/incubator-weex,bigconvience/weex,misakuo/incubator-weex,leoward/incubator-weex,boboning/weex,LeeJay0226/weex,KalicyZhou/incubator-weex,miomin/incubator-weex,MrRaindrop/weex,KalicyZhou/incubator-weex,Neeeo/incubator-weex,Hanks10100/incubator-weex,Tancy/weex,acton393/weex,kfeagle/weex,alibaba/weex,MrRaindrop/weex,Tancy/weex,kfeagle/weex,namedlock/weex,zzyhappyzzy/weex,MrRaindrop/weex,acton393/incubator-weex,namedlock/weex,xiayun200825/weex,acton393/incubator-weex,Tancy/weex,zhangquan/weex,Neeeo/incubator-weex,misakuo/incubator-weex,erha19/incubator-weex,alibaba/weex,yuguitao/incubator-weex,Tancy/weex,acton393/incubator-weex,KalicyZhou/incubator-weex,cxfeng1/weex,cxfeng1/weex,Neeeo/incubator-weex,alibaba/weex,lvscar/weex,KalicyZhou/incubator-weex,LeeJay0226/weex,misakuo/incubator-weex,namedlock/weex,xiayun200825/weex,MrRaindrop/incubator-weex,bigconvience/weex,kfeagle/weex,yuguitao/incubator-weex,KalicyZhou/incubator-weex,Hanks10100/weex,acton393/incubator-weex,cxfeng1/weex,cxfeng1/incubator-weex,leoward/incubator-weex,namedlock/weex,cxfeng1/incubator-weex,zzyhappyzzy/weex,bigconvience/weex,LeeJay0226/weex,cxfeng1/incubator-weex,boboning/weex,zzyhappyzzy/weex,HomHomLin/weex,bigconvience/weex,erha19/incubator-weex,kfeagle/weex,Neeeo/incubator-weex,yuguitao/incubator-weex,yuguitao/incubator-weex,namedlock/weex,alibaba/weex,weexteam/incubator-weex,KalicyZhou/incubator-weex,zzyhappyzzy/weex,yuguitao/incubator-weex,acton393/weex,Neeeo/incubator-weex,lvscar/weex,erha19/incubator-weex,kfeagle/weex,MrRaindrop/incubator-weex,Hanks10100/weex,alibaba/weex,erha19/incubator-weex,MrRaindrop/weex,MrRaindrop/incubator-weex,lvscar/weex,cxfeng1/weex,lvscar/weex,kfeagle/weex,Tancy/weex,Hanks10100/weex,dianwodaMobile/DWeex,zhangquan/weex,xiayun200825/weex,zhangquan/weex,miomin/incubator-weex,miomin/incubator-weex,cxfeng1/incubator-weex,dianwodaMobile/DWeex,acton393/incubator-weex,cxfeng1/weex,lvscar/weex,cxfeng1/incubator-weex,erha19/incubator-weex,acton393/incubator-weex,leoward/incubator-weex,miomin/incubator-weex,miomin/incubator-weex,Hanks10100/weex,Tancy/weex,Hanks10100/incubator-weex,misakuo/incubator-weex,Hanks10100/incubator-weex,acton393/weex,alibaba/weex,acton393/incubator-weex,MrRaindrop/weex,acton393/weex,lvscar/weex,HomHomLin/weex,Hanks10100/weex,dianwodaMobile/DWeex,xiayun200825/weex,boboning/weex,HomHomLin/weex,bigconvience/weex,HomHomLin/weex,zzyhappyzzy/weex,acton393/incubator-weex,miomin/incubator-weex,Hanks10100/incubator-weex,weexteam/incubator-weex,erha19/incubator-weex,weexteam/incubator-weex,Hanks10100/incubator-weex,xiayun200825/weex,erha19/incubator-weex,Hanks10100/incubator-weex,LeeJay0226/weex,zhangquan/weex,cxfeng1/weex,MrRaindrop/incubator-weex,weexteam/incubator-weex,acton393/weex,zzyhappyzzy/weex,LeeJay0226/weex,miomin/incubator-weex,leoward/incubator-weex