Merge branch 'research_guides' into staging
Merge branch 'dev' into staging

Conflicts:
	research/guides/index.php
Merge branch 'staging'
Added artstor contact information as interim fix
Fixed commented out content
Merge branch 'Faculty-services-page-update' into staging
Merge branch 'staging'
htaccess edit
Merge branch 'quickfix'

Conflicts:
	.htaccess
Merge branch 'master' of github.com:ssu-library/library.working.dev

Conflicts:
	.htaccess
Updated nav-spaces to point to the right directory
Merge branch 'studyrooms' into staging
Merge branch 'staging'
db banner image and sp. col edits
ssudb_banner.jpg
Merge branch 'master' of github.com:ssu-library/library.working.dev
Corrected the EBSCO search box on research page
Merge branch 'EBSCO-Search-Fix' into staging
Small changes to several pages based on Paula's feedback
Merge branch '20140630-issues' into staging