upgrade express-asset-manager
small changes if client side app.js
Merge branch 'master', remote branch 'origin'