add authorize
Merge remote-tracking branch 'github/master'

Conflicts:
	app.js
	routes/index.js
	socket/index.js