Require.js added client side
Merge remote-tracking branch 'origin/master'