User login and home page personalisation
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/internal_site/util/validateUser.jsp