Fixed nick changes
Merge branch 'master' into plugins

Conflicts:
	src/server_events.c