TST-1 master change #3
TST-1 302 change #3
TST-1 Merge branch 'GIT-305' (attempt 3)

Conflicts:
	welcome.css