Fix some space/tab issues in README
Another tab fix.
Removed the last \t from the README...
disabled proguard. fixed gradle libs
more error handling for http connection
basic beam code / untested
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
fixed merge error
unfinishd qr code implemenation. thanks to @emdete
fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete
support pre JELLY_BEAN ndef
be more OO
Merge pull request #620 from emdete/p0

P0
added missing return statement. fixed api bug
made qr code available from muc and contact details as well