Track the client's nick changes
Merge branch 'track-nick-changes' into HEAD

Conflicts:
	js/my.js