update to 14.0.6 alpha 2
getAddress() should return the base address with resource
The Presence is updated with the latest resource value, but the
address remains the same, loaded when the roster is loaded, which
means we ned up with no resource at all.
This ensures the getAddress() always include the latest highest
priority presence.
fixed version code to actually be higher
some optimizations for sha1 hashing on OTRData
formatting updates find src/ -name \*.java |xargs sed -i 's, *$,,'
as requested by HC
simplify implementation based on @eighthave recommendation
Merge pull request #570 from n8fr8/dev_more_resource_fixes

Another proposed fix for null/missing resource issue
Merge branch 'guarantee_unique_resource_and_more' of https://github.com/eighthave/ChatSecureAndroid into eighthave-guarantee_unique_resource_and_more

Conflicts:
	src/info/guardianproject/otr/app/im/app/AccountWizardActivity.java
	src/info/guardianproject/otr/app/im/app/MessageView.java
	src/info/guardianproject/otr/app/im/app/NewChatActivity.java
	src/info/guardianproject/otr/app/im/plugin/xmpp/XMPPCertPins.java
	src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java
	src/info/guardianproject/otr/app/im/service/RemoteImService.java
Merge branch 'eighthave-guarantee_unique_resource_and_more'
update to 14.0.6 beta 1
load latest presence for all that request
setFrom() to full JID to address bug #3948
ensures chat title is reset on end chat. fixes #555 on github.
make sure roster is not null when you tried to load presence
make the save/persist code a bit more reliable
remove redundant/confusing method
set a date to the internal Message instance
Merge pull request #574 from n8fr8/master

a few issues
rough update of commits/changes for 14.0.6 BETA
more to do...
update changelog for v14.0.6 beta 1