Merge pull request #2671 from sebv/master

Upgraded all packages but express
migrated to express 4