added requirejs
fixed merge conflicts