Some stuff
Merge branch 'master' of github.com:Declose/mt2

Conflicts:
	server/auth.js