Use ScriptInjector for JS resources (required for SuperDevMode)
Merge remote-tracking branch 'origin/master'