changes to the resovisions.js file and the resovisions/edit view
fixed merges in application.js and resovision.js files