S.C. edit 080814
Merge branch 'SCedit'
Edited Check-Out Desk
Merge branch 'Check-Out'
Link fixes
Merge branch 'Fixlinks'
Alert for SSO set up

Uncommented the alert.php file.
Merge branch '20140817-ILL-changes'

Conflicts:
	services/borrowing/otherlibraries/index.php
Nursing and hours
Merge branch 'Linkfixes'
Merge branch 'master' of github.com:ssu-library/library.working.dev
Small edit re Paula
Merge branch 'Linkfixes'
Nursing videos, room reservation forms.
Merge branch 'Linkfixes'
Edits to nursing, update 2nd floor map.
Merge branch 'Nursingedits'
2nd floor map edit
Merge branch 'Nursingedits'
2nd floor