using requirejs for both background and content scripts
Merge branch 'toplayout' into dev