update js and controller
Merge branch 'annguyen' into develop
update layout
Merge branch 'annguyen' into develop

Update Layout
update ignore file
Long push some files to test
Test
Merge branch 'core-api' into develop