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

Conflicts:
	welcome.css