Just doing some local tidy up to allow a merge to happen
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/skylight.php
	theme-local/.DS_Store
LIB001-454 Update the Exams theme to have the Google Analytics code
Merge pull request #40 from robintaylor/LIB001-454

LIB001-454 Update the Exams theme to have the Google Analytics code