what the fuck is wrong with you master?
fljdljsdjMerge branch 'master' of https://github.com/crankyManky/Ppl2Ppl2

Conflicts:
	web/WEB-INF/faces-config.xml