Merge pull request #1057 from annando/master

Removing of several warnings to make the dav addon work again
Merge pull request #1058 from annando/master

Make the friendica android client work again
Merge remote-tracking branch 'upstream/master'
There seems to be problems with encoding - this should fix it.