Usa r.js
Merge branch 'feature/r.js' into beta
Release v2.3.6-beta