some cleanup
Merge branch 'master' of https://github.com/pokerazor/friendica-for-android.git