try to enable inline commenting
Merge remote-tracking branch 'origin/master'

Conflicts:
	mw-android-friendica-01/gen/de/wikilab/android/friendica01/R.java