Update express to 4.x
Merge branch 'develop'