authentication completed
Merge branch 'master' into github_master

Conflicts:
	server/auth.js