progress thus far. logout/ i feel you
Merge branch 'master' of https://github.com/Aeiko/idp-spreadthelove

Conflicts:
	SpreadTheLove/WebContent/home.jsp