updated resources.js to master