update js and controller
Merge branch 'annguyen' into develop