JS updated
Merge branch 'feature/1515_offcanvas' into develop