XEP-0172
Contact presenceName property
fixed #403
rotate avatars

Conflicts:
	src/eu/siacs/conversations/persistance/FileBackend.java
fixed #406
fixed pgp signature creation
more openpgp bug fixes
improve regex, implement pattern cache
make pattern static
set openpgp-api-lib to a version that actually works
use class, use codepoint
improve emo mapping
Merge pull request #417 from emdete/unicode_emoticons

improve regex, implement pattern cache
Merge pull request #397 from GZep/development

XEP-0172
nick parsing (xep 0172) also enabled for messages and for pep
made muc password dialog hide the password (password field)
reconnect accounts when resource has been changed in settings
fixed #342 - otr with facebook and other services without resources
improved logging for avatar fetches
warn user if no presence subscription exists