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

Conflicts:
	app/server/routes/controlpanel/login.js