Merge pull request #226 from afrjorge/require-js

cherry-pick [CDE-270]