Merge remote-tracking branch 'origin/master'

Conflicts:
	Tafshir/res/layout/activity_detail_of_sura.xml