update
Merge branch 'master' of https://github.com/JSoon/requirejs-test