deleted files
merged with upstream
Merge remote-tracking branch 'upstream/master'

Merged with branch
Merge pull request #22 from rentonsa/master

LIB001-469 SPIRIT Harvesting from ISDOCs
LIB001-464 - various changes for the Exam Papers
LIB001-464 More general changes for the exam papers
LIB001-427 Art CSS
LIB001-464 Some more stuff for the exam papers
Merge pull request #23 from robintaylor/LIB001-464

LIB001-464 Some more initial changes for the Exam Papers
LIB001-512 - config for clds
Euchmi removed as has been renamed previously to mimed
LIB001-431 removed footers as do not overwrite skylight footer and therefore lead to 2 footers being displayed
Removed as in wrong location
Merge remote-tracking branch 'upstream/master'

Conflicts:
	theme/fineart/views/header.php
Merge pull request #24 from seesmith/master

Changed for Art and general tidy up