more chat cursor cleanup, more logging
Merge branch 'upstream' into word
onChange is async, be defensive there

in case activity was already destroyed by the time the dispatch came through
bad static fields!!11!1!

An activity can have multiple concurrent non-destroyed instances
Don't try to set empty password in WelcomeActivity when already open

fixes #1987
Speed up requery on incoming message

fixes #2008
More strictmode stuff when debug flag is on
Do not create new task for chat activity by default

fixes #2033
Merge pull request #291 from devrandom/word

Cacheword issues
Merge pull request #294 from devrandom/back

Do not create new task for chat activity by default
updated version
fixing padding on emoji
if default list already exists, use that
fixes #2025 - subscribe presence was being overwritten by roster load
better logic for reloading chat cursor
make icons fill the space
don't cache avatar drawables, and use ViewHolders
fixing contact grid width/height and moving to dimension list
made avatar icon a wee bit larger
make sure avatar is redrawn properly each time we need it