migrated to express 4
Merge pull request #2687 from sebv/express-4

Migrated to express 4