XEP-0172
Contact presenceName property
updated readme
optimize string operations a bit
Merge pull request #402 from emdete/remove_poormans_tostring

optimize string operations a bit
fixed #403
fixed #403
removed unused string resources.
transform ascii to emoticons (on display only)
Merge pull request #380 from emdete/unicode_emoticons

add translation from ascii to unicode emoticons
add all whitespaces in regex
Merge pull request #408 from emdete/unicode_emoticons

add all whitespaces in regex
rotate avatars
fixed #406
rotate avatars

Conflicts:
	src/eu/siacs/conversations/persistance/FileBackend.java
fixed #406
refactored share with activity
fixed #410 by removing that config option
Merge branch 'unused_resources' of https://github.com/betheg/Conversations into betheg-unused_resources
Merge branch 'betheg-unused_resources' into development