History in the making
Merge branch 'master' of https://github.com/App-art-eid/Bidra

Conflicts:
	Bidra/AndroidManifest.xml