Use icon from #905 for push message disable confirmation box
//FREEBIE
Make notification preferences look normally
Merge pull request #955 from benalbrecht/nocount

Use new icon from #905 for push message disable confirmation box
Merge pull request #961 from cloudkicker/notification_preferences

Make notification preferences look normally
Support videos from other apps. Fixes #949
Add possiblity to refresh the push directory directly from the contact picking list. Fixes #835. Fixes #859.

Thanks benalbrecht for the icons.
Merge pull request #956 from tinloaf/refreshfromlist

Add possiblity to refresh the push directory directly from contact list
Merge pull request #966 from backspace/add-video-sharing

Support videos from other apps. Fixes #949
Workaround for Android bug when swiped from recent tasks list.

Closes #168

https://code.google.com/p/android/issues/detail?id=53313
pending messages more accurately conveyed to user
Reload contact list after directory refresh // FREEBIE

I forgot that in my PR, it seems.
Merge pull request #975 from tinloaf/reloadcontactlist

Reload contact list after directory refresh // FREEBIE
Merge pull request #796 from mcginty/pending_messages

pending messages more accurately conveyed to user
Updated language translations.
s/Verify Recipient/Verify Identity/
Bump version to 2.0.4
Added more build information to BUILDING.md

Added more instructions about setting up a development environment.
Use the "screen security" preference for the conversation list

It was previously only used for ConversationListActivity. This should be all
the locations (according to a grep for FLAG_SECURE).

FREEBIE
Merge pull request #1007 from SamWhited/issue998

s/Verify Recipient/Verify Identity/
Only receive text/plain.

At the moment only text/plain is handled in RoutingActivity, so set filter in manifest accordingly.
This prevents #316. But at some point sharing text/calendar or better */* would be nice...

// FREEBIE