add branch chnages
add controller.js and util.js
modified controller.js