Merge remote branch 'upstream/master'
Collections, Classifications

Updated creators and location
Merge pull request #10 from mindking/master

Collections and Classification added, updated creators and location
Merge remote branch 'upstream/master'
Limit the updateResearchCartLinks javascript to themed pages

The updateResearchCartLinks javascript should not be included on pages that have no theme, as there are no research cart links to update. This is very important for the Public EAD List page in particular, as the exported xml files should not have javascript inserted above the root element since it causes parsing and rendering errors. 

I've added the disabletheme request to the condition check for inserting that javascript function call.
Merge pull request #11 from jeffnm/patch-1

Limit the updateResearchCartLinks javascript to themed pages
Accessions, DigitalContent

Accessions, DigitalContent, UserGroups
Merge pull request #12 from mindking/master

Adding json for Accessions, Digital Content, and UserGroups; adding relationships for Collections
Merge remote branch 'upstream/master'
change Country to ISOAlpha3
made queries case sensitive
remove archon-nouveau template and flatten users json
Merge pull request #13 from chrisprom/master

flatten users json, remove archon-nouveau template, and edit accession list
move subjecttypes and subjectsources json output to enums
Merge pull request #14 from chrisprom/master

move subject sources and subject types to enums
Update collection.inc.php

Fixing a typo that broke EAD exports which include multiple digital content entries by making them invalid xml through improper attribute construction.
Merge pull request #15 from jeffnm/patch-1

Update collection.inc.php
add getAllSubjectsforJSON function and cleanup JSON formatting for subjects
Merge pull request #16 from chrisprom/master

flatten subjects json and change to batch_start
Accessions Collections DigitalContent