Show roster after roster received
Merge branch 'master' into plugins

Conflicts:
	src/xmpp/roster.c