Toan | Fixing JS asset pipeline
Merge branch 'development'