cookie and username are now different.

Conflicts:
	m2server-module.js