Passport fix
Merge remote-tracking branch 'origin/feature-orm' into feature-orm

Conflicts:
	server/authStrategies/facebook.js
	server/authStrategies/github.js
	server/authStrategies/twitter.js
	server/index.js
	server/passport.js