update express 4.x
Merge branch 'master' into openshift

Conflicts:
	package.json
prettydate is not working with this version of jade. so commented out.
Merge branch 'master' into openshift
fix prettydate