Modified gitignore
Removed DS Store
Merge remote-tracking branch 'upstream/master'

Conflicts:
	theme-local/.DS_Store
LIB001-427 art config to remove date and update to upper case
LIB001-515 Override some of the skylight.php config in exams.php
Merge pull request #27 from robintaylor/master

LIB001-515 Override some of the skylight.php config in exams.php
Merge pull request #28 from ianthe/master

Changing Fine Art to Art
LIB001-517 Reverse the order of the terms in the Academic Year facet for the Exam Papers
LIB001-519 Add autocomplete to the Search box for the Exam Papers
Merge pull request #30 from robintaylor/master

LIB001-517 Reverse the terms in the Academic Year facet for the Exam Papers
LIB001-536 Add breadcrumbtrail to Exam Papers
LIB001-536 Forgot to add the stylesheet
Merge pull request #31 from robintaylor/master

LIB001-536 Add breadcrumb trail to Exam Papers
LIB001-536 Doh! Forgot to add an image.
Merge pull request #32 from robintaylor/master

LIB001-536 Add breadcrumb trail to Exam Papers
LIB001-537 Display more fields on search results and item pages for Exam Papers
Merge pull request #33 from robintaylor/master

LIB001-537 Add fields on search results and item pages for Exam Papers
Merge pull request #29 from ianthe/master

Renaming skylight local fineart to art
Merge pull request #26 from seesmith/master

LIB001-427 Art config changes and gitignore update
.gitignore is now hopefully working