splashscreens
Merge branch 'master' of https://github.com/rhastings-epigeum/SDS

Conflicts:
	courses_dev/html/csd_welcome.html
	courses_dev/html/epe_welcome.html
	courses_dev/html/tro_welcome.html