Express 4 upgrade
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/server/modules/db-manager.js
	app/server/setup.js