Update OAuth2.0 callback url
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/config.js
Update OAuth2.0 callback url