fix merge conflicts
fix merge conflicts

marcioj/riot,marcioj/riot,thepian/riot,qrb/riotjs,AndrewSwerlick/riot,daemonchen/riotjs,thepian/riot,xtity/riot,baysao/riot,rthbound/riot,qrb/riotjs,xtity/riot,rthbound/riot,sylvainpolletvillard/riot,zawsx/js-lib-webcomponents-react-riot,seedtigo/riot,chetanism/riot,dschnare/riot,noodle-learns-programming/riot,crisward/riot,dschnare/riot,rasata/riot,sylvainpolletvillard/riot,mike-ward/riot,txchen/riotjs,stonexer/riot,rasata/riot,stonexer/riot,duongphuhiep/riot,madlordory/riot,dp-lewis/riot,chetanism/riot,joshcartme/riot,davidmarkclements/riot,seedtigo/riot,mike-ward/riot,tao-zeng/riot,noodle-learns-programming/riot,muut/riotjs,dp-lewis/riot,madlordory/riot,joshcartme/riot,tao-zeng/riot,davidmarkclements/riot,laomu1988/riot,muut/riotjs,AndrewSwerlick/riot,beni55/riot,laomu1988/riot,scalabl3/riot,zawsx/js-lib-webcomponents-react-riot,scalabl3/riot,duongphuhiep/riot,daemonchen/riotjs,txchen/riotjs,beni55/riot,crisward/riot,baysao/riot