Build js file with r.js
优化代码，合并改成r.js来实现
添加文档
merge confilict from upstream
fix conflict from upstream
Merge pull request #118 from 2betop/master

Optimize