Merge branch 'LIB001-454'
LIB001-579 Some initial config for Physics collection
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/physics.php
Merge pull request #52 from robintaylor/master

LIB001-579 Some initial config for Physics collection
LIB001-503 Take the jQuery stuff out of the Exams header
Merge pull request #53 from robintaylor/master

LIB001-503 Take the jQuery stuff out of the Exams header
LIB001-580: Adding IS logo to footer
LIB001-583: Updated Art theme to blue & green
Merge pull request #55 from ianthe/LIB001-580

LIB001-580: Adding IS logo to footer
Merge pull request #56 from ianthe/LIB001-583

LIB001-583: Updated Art theme to blue & green
Merge remote-tracking branch 'upstream/master'