adjust path in render script
Merge pull request #605 from emdete/render_gradle_path

adjust path in render script
Fix some space/tab issues in README
Another tab fix.
Removed the last \t from the README...
Wrap "last seen" time.

Fixes #611
Merge pull request #615 from SamWhited/issue611

Wrap "last seen" time
Merge branch 'development' of https://github.com/siacs/Conversations into development
Merge pull request #614 from SamWhited/spacefixes

Fix some space/tab issues in README
create file explicitly before downloading image
basic beam code / untested
use different filter for nfc intents
Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc

Conflicts:
	src/main/AndroidManifest.xml