Fix merge of git submodules

Need to add requirejs back in