edit README
Merge branch 'master' into feature.requireJS