Solved merge conflicts on devtools.js, should be good to go
Solved merge conflicts on devtools.js, should be good to go

sschwartz0/DejaVue,kimhjona/DejaVue,kimhjona/DejaVue,sschwartz0/DejaVue,MiCottOn/DejaVue,MiCottOn/DejaVue