trying
merge fixed?
Merge branch 'master' of https://github.com/crankyManky/Ppl2Ppl2

Conflicts:
	web/com.example.ppl2ppl/donation.xhtml