Commit Counsellor home so i can pull codes.
Merge branch 'master' of https://github.com/Aeiko/idp-spreadthelove

Conflicts:
	SpreadTheLove/WebContent/css/custom.css