Fix typos in string resource
Remove full stop in description for consistency
Merge pull request #506 from SamWhited/string_fixes

Summary string typo fix
removed unecessary update
synchronization for notification
synchronization for listeners
Merge branch 'development' of github.com:siacs/Conversations into development
remove warning about <> cast
Merge pull request #547 from emdete/p0

remove warning about <> cast
beautify render script to be easier to diff/patch
Merge pull request #551 from emdete/p4

beautify render script to be easier to diff/patch
refactored file download status. make image http download available for carbon copied (sent) messages as well
Merge branch 'development' of github.com:siacs/Conversations into development
detect deleted files on start up. got rid of lagecy image provider for performance reasons. NOTE: this will prevent you to access images older than version 0.6
added file observer to get notified when files are deleted: fixes #396
add pre kitkat emo, add 4-state config
add qrcode and beam functionality to exchange jid
add my icons
pimp to my defaults