Smack 4.0.4-SNAPSHOT
Load roster before sending the initial presence

SMACK-596
Merge branch '4.0'

Conflicts:
	build.gradle
Merge branch 'master' into xep198

Conflicts:
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java