Layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	Donate Me/res/layout/orgpage.xml