Merge with New landing page and tours and some bug fixes.

Merge branch 'master' of https://github.com/Aeiko/idp-spreadthelove

Conflicts:
	SpreadTheLove/WebContent/accountSettings.jsp
	SpreadTheLove/WebContent/activity.jsp
	SpreadTheLove/WebContent/faq.jsp
	SpreadTheLove/WebContent/home.jsp
	SpreadTheLove/WebContent/posts-I-followed.jsp
	SpreadTheLove/WebContent/questions-I-asked.jsp
	SpreadTheLove/WebContent/viewCounsellorAnswered.jsp
	SpreadTheLove/WebContent/viewCounsellorFollowed.jsp
	SpreadTheLove/WebContent/viewCounsellorHome.jsp
	SpreadTheLove/WebContent/viewCounsellorSearch.jsp
	SpreadTheLove/WebContent/viewPending.jsp