better error checking in ssl switch over
better error checking in ssl switch over

Conflicts:
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
show full time stamp in connection established field
show full time stamp in connection established field
version bump to 0.8.4
Merge branch 'master' into development

Conflicts:
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
Merge branch 'development' of https://github.com/siacs/Conversations into development